From: Brian West Date: Fri, 26 Sep 2014 14:00:09 +0000 (-0500) Subject: FS-6860 #resolve this was fixed once but was lost in the last sync X-Git-Tag: v1.4.9~4^2~9 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c89c21153534fa04da170fc1453b5f0f93cf7bb;p=thirdparty%2Ffreeswitch.git FS-6860 #resolve this was fixed once but was lost in the last sync --- diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c index 7f4318e543..6fa69d2161 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/ws.c +++ b/libs/sofia-sip/libsofia-sip-ua/tport/ws.c @@ -11,6 +11,11 @@ #define ms_sleep(x) Sleep( x ); #endif +#ifdef _MSC_VER +/* warning C4706: assignment within conditional expression*/ +#pragma warning(disable: 4706) +#endif + #define WS_BLOCK 1 #define WS_NOBLOCK 0 diff --git a/src/mod/endpoints/mod_verto/ws.c b/src/mod/endpoints/mod_verto/ws.c index 7f4318e543..6fa69d2161 100644 --- a/src/mod/endpoints/mod_verto/ws.c +++ b/src/mod/endpoints/mod_verto/ws.c @@ -11,6 +11,11 @@ #define ms_sleep(x) Sleep( x ); #endif +#ifdef _MSC_VER +/* warning C4706: assignment within conditional expression*/ +#pragma warning(disable: 4706) +#endif + #define WS_BLOCK 1 #define WS_NOBLOCK 0