From 6c4f1da92bae91bf95ece40326ae0cf70c4273fd Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 7 Nov 2013 14:32:53 +0100 Subject: [PATCH] update ortp to fix conflict with gettimeofday defined both in ortp and tunnel. update documentation --- README.mingw | 4 ---- coreapi/misc.c | 4 ++-- oRTP | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/README.mingw b/README.mingw index e60a1e335..39b41d3df 100644 --- a/README.mingw +++ b/README.mingw @@ -65,10 +65,6 @@ WARNING: During the build, windows might slow down suddenly. Using ctl+alt+del t you might see a process 'LVpSRV.exe' or something like this that eats 90% of cpu. Kill it. Don't know what it is, but once killed, windows runs normally. -#Compile and install tunnel (optional, available under proprietary licensing) - -cd tunnel && ./autogen.sh && ./configure --prefix=/usr --enable-shared --disable-static && make && make install - #Build linphone itself: #run autogen.sh after a git checkout or update diff --git a/coreapi/misc.c b/coreapi/misc.c index b9a027d6e..7d9b70b3f 100644 --- a/coreapi/misc.c +++ b/coreapi/misc.c @@ -528,7 +528,7 @@ int linphone_core_run_stun_tests(LinphoneCore *lc, LinphoneCall *call){ } got_audio=FALSE; got_video=FALSE; - gettimeofday(&init,NULL); + ortp_gettimeofday(&init,NULL); do{ int id; @@ -561,7 +561,7 @@ int linphone_core_run_stun_tests(LinphoneCore *lc, LinphoneCall *call){ cone_video=TRUE; got_video=TRUE; } - gettimeofday(&cur,NULL); + ortp_gettimeofday(&cur,NULL); elapsed=((cur.tv_sec-init.tv_sec)*1000.0) + ((cur.tv_usec-init.tv_usec)/1000.0); if (elapsed>2000) { ms_message("Stun responses timeout, going ahead."); diff --git a/oRTP b/oRTP index 120e58e2c..b5d1414e6 160000 --- a/oRTP +++ b/oRTP @@ -1 +1 @@ -Subproject commit 120e58e2c12d608ecb7a2f0c4ae91768cb1862a0 +Subproject commit b5d1414e63b21c83eb8e26988a3fe423ff8fc3b3