jrtp4c windows tweaks

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@962 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/jrtplib/jrtplib.vcproj b/libs/jrtplib/jrtplib.vcproj
index a383a8abc05194861a928cf73a5d4a66c788daa1..cce60ff682856db6513ed59c3e3941b8bf5fa39f 100644 (file)
--- a/libs/jrtplib/jrtplib.vcproj
+++ b/libs/jrtplib/jrtplib.vcproj
@@ -290,18 +290,10 @@
                        Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
                        >\r
-                       <File\r
-                               RelativePath=".\src\jmutex.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath=".\src\jrtp4c.h"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath=".\src\jthread.h"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath=".\src\rtcpapppacket.h"\r
                                >\r
@@ -484,18 +476,10 @@
                        Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
                        >\r
-                       <File\r
-                               RelativePath=".\src\win32\jmutex.cpp"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath=".\src\jrtp4c.cpp"\r
                                >\r
                        </File>\r
-                       <File\r
-                               RelativePath=".\src\win32\jthread.cpp"\r
-                               >\r
-                       </File>\r
                        <File\r
                                RelativePath=".\src\rtcpapppacket.cpp"\r
                                >\r

diff --git a/libs/jrtplib/src/jrtp4c.cpp b/libs/jrtplib/src/jrtp4c.cpp
index dfeb215b352b573bbd3218d942c0d2811e10eac9..9a6b34a57af0e848f6cabd8df921e782e8d22b27 100644 (file)
--- a/libs/jrtplib/src/jrtp4c.cpp
+++ b/libs/jrtplib/src/jrtp4c.cpp
@@ -143,8 +143,12 @@ void jrtp4c_destroy(struct jrtp4c **jrtp4c)
        jrtp4c_killread(*jrtp4c);
 
        while (((*jrtp4c)->flags & JF_READ) || ((*jrtp4c)->flags & JF_WRITE)) {
+#ifdef WIN32
+               Sleep(1);
+#else
                usleep(1000);
                sched_yield();
+#endif
        };
 
        (*jrtp4c)->session->BYEDestroy(RTPTime(10,0),0,0);

diff --git a/libs/jrtplib/src/rtpconfig_win.h b/libs/jrtplib/src/rtpconfig_win.h
index 43602664eccef4f31af6bf154c59673a725fa396..1ca60d502e513a32c27bfadf6ea946ec62cdb599 100644 (file)
--- a/libs/jrtplib/src/rtpconfig_win.h
+++ b/libs/jrtplib/src/rtpconfig_win.h
@@ -36,7 +36,7 @@
 
 #define RTP_SUPPORT_IPV4MULTICAST
 
-#define RTP_SUPPORT_THREAD
+//#define RTP_SUPPORT_THREAD
 
 #define RTP_SUPPORT_PROBATION