fix windows build

diff --git a/configure.ac b/configure.ac
index 8db4ab8a36d64614dab0a9e3a516d25f5f0ac102..3e0eefcc9e22259abfdc2e789e2a5e6c5a4020ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_INIT([linphone],[3.3.99.10],[linphone-developers@nongnu.org])
+AC_INIT([linphone],[3.4.0],[linphone-developers@nongnu.org])
 AC_CANONICAL_SYSTEM
 AC_CONFIG_SRCDIR([coreapi/linphonecore.c])
 

diff --git a/coreapi/ec-calibrator.c b/coreapi/ec-calibrator.c
index df56ff686d1304967d52c3af4e6556f6bb1de1af..4c8a37586ebf538f580915bdd39424a3321d4dab 100644 (file)
--- a/coreapi/ec-calibrator.c
+++ b/coreapi/ec-calibrator.c
@@ -110,18 +110,18 @@ static void ecc_play_tones(EcCalibrator *ecc){
 
        /*play an initial tone to startup the audio playback/capture*/
        ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
-       sleep(2);
+       ms_sleep(2);
 
        ms_filter_set_notify_callback(ecc->gen,on_tone_sent,ecc);
        tone.frequency=2000;
        tone.duration=100;
 
        ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
-       sleep(1);
+       ms_sleep(1);
        ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
-       sleep(1);
+       ms_sleep(1);
        ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
-       sleep(1);
+       ms_sleep(1);
 
        if (ecc->sent_count==3 && ecc->recv_count==3){
                int delay=ecc->acc/3;

diff --git a/mediastreamer2 b/mediastreamer2
index 47f19a376ee7f5bfea93714bc094a8f4ffcebce4..b2ad8c3befdcb4fa8203b655f54114ad8d6c6925 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 47f19a376ee7f5bfea93714bc094a8f4ffcebce4
+Subproject commit b2ad8c3befdcb4fa8203b655f54114ad8d6c6925