fix for msvc 9 build.

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

diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
index a8d7fb5b38dfc92f12704e4dd6f033864cfa6049..c5a0389c540527d58e8f5e5d6657058b19977630 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
+++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/sres.c
@@ -141,7 +141,7 @@ int sres_close(sres_socket_t s)
   return closesocket(s);
 }
 
-#if !defined(IPPROTO_IPV6)
+#if !defined(IPPROTO_IPV6) && (_WIN32_WINNT < 0x0600)
 #if HAVE_SIN6
 #include <tpipv6.h>
 #else

diff --git a/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h b/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h
index 4370f958c33c90bb89a4e53e030b2658bc329488..2b1eb660077079858461c2fe814bdd2b1cacb84c 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h
+++ b/libs/sofia-sip/libsofia-sip-ua/su/sofia-sip/su.h
@@ -67,7 +67,7 @@
 #  include <winsock2.h>
 #  include <ws2tcpip.h>
 #  if SU_HAVE_IN6
-#    if defined(IPPROTO_IPV6)
+#    if defined(IPPROTO_IPV6) || (_WIN32_WINNT >= 0x0600)
 /*     case 1: IPv6 defined in winsock2.h/ws2tcpip.h */
 #    else
 /*     case 2: try to use "IPv6 Tech Preview" */

diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h b/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h
index cf3b2205d07919cb7573e84de4b847c08cfaace6..2517fa9d5f1f30a5215c235d2d43e3ef74667dee 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_internal.h
@@ -67,6 +67,12 @@
 #define MSG_NOSIGNAL (0)
 #endif
 
+#if (_WIN32_WINNT >= 0x0600)
+#ifndef HAVE_MSG_TRUNC
+#define HAVE_MSG_TRUNC 1
+#endif
+#endif
+
 #if !HAVE_MSG_TRUNC
 #define MSG_TRUNC (0)
 #endif

diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c b/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c
index 74e15b38a3fd3fa3fcfc6b1f338ebdbd9ddb0e96..d843fb7cfb7c99a4277d2f23fbfcbb88b14bdba1 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_udp.c
@@ -196,7 +196,7 @@ static void tport_check_trunc(tport_t *tp, su_addrinfo_t *ai)
 
   n = su_sendto(tp->tp_socket,
                "TEST", 4, 0,
-               (void *)ai->ai_addr, ai->ai_addrlen);
+               (void *)ai->ai_addr, (socklen_t)ai->ai_addrlen);
 
   if (n != 4)
     return;

diff --git a/libs/sofia-sip/win32/config.h.in b/libs/sofia-sip/win32/config.h.in
index 8d10097d798196df588f56da38094b7e7503960d..5bbca9de8406a2a9ce7e01dcb2184c55f280f1a2 100644 (file)
--- a/libs/sofia-sip/win32/config.h.in
+++ b/libs/sofia-sip/win32/config.h.in
@@ -457,7 +457,13 @@
 #define strncasecmp _strnicmp
 
 #define snprintf _snprintf
+
+#ifndef _MSC_VER 
+#define vsnprintf _vsnprintf
+#endif
+#if _MSC_VER < 1500
 #define vsnprintf _vsnprintf
+#endif
 
 #define srandom(x)    srand((x))
 #define random()      rand()

diff --git a/libs/sofia-sip/win32/sofia-sip/su_configure.h b/libs/sofia-sip/win32/sofia-sip/su_configure.h
index c6c3b89075821635eace0532adc32f551108875a..8d01703a1e0600d030b38a0ba9c222d7d6439fc9 100644 (file)
--- a/libs/sofia-sip/win32/sofia-sip/su_configure.h
+++ b/libs/sofia-sip/win32/sofia-sip/su_configure.h
@@ -104,7 +104,12 @@
 #define snprintf    _snprintf
 #endif
 #ifndef vsnprintf
-#define vsnprintf   _vsnprintf
+#ifndef _MSC_VER 
+#define vsnprintf _vsnprintf
+#endif
+#if _MSC_VER < 1500
+#define vsnprintf _vsnprintf
+#endif
 #endif
 
 #define srandom(x)    srand((x))