Changeset 2331 for pjproject/trunk/pjlib/include/pj/compat/socket.h

Timestamp:

Sep 27, 2008 1:16:35 PM (16 years ago)

Author:

bennylp

Message:

Fixed ticket #644 and 648 again (hopefully once and for all): build error on VS6 with built-in SDK and on PocketPC 2003 SDK since they don't have multicast related socket options

File:

• pjproject/trunk/pjlib/include/pj/compat/socket.h (modified) (3 diffs)

pjproject/trunk/pjlib/include/pj/compat/socket.h

@@ -32 +32 @@
 #  include <winsock.h>
 #endif
+
+#if defined(PJ_HAS_WS2TCPIP_H) && PJ_HAS_WS2TCPIP_H != 0
+#   include <ws2tcpip.h>
+#endif
+
 
 /*
@@ -59 +64 @@
 #   endif
 
-#   include <ws2tcpip.h>
-#   define PJ_WS2TCPIP_H_INCLUDED
-
 #   if !defined(IPPROTO_IPV6)
         /* Need to download and install IPv6Kit for this platform.
@@ -71 +73 @@
 #   define PJ_SOCK_HAS_GETADDRINFO  1
 #endif  /* _MSC_VER */
-
-/* Mingw32 needs ws2tcpip.h for the IGMP constants */
-#if defined(__GNUC__) && defined(WIN32) && !defined(PJ_WS2TCPIP_H_INCLUDED)
-#   include <ws2tcpip.h>
-#endif
 
 #if defined(PJ_HAS_SYS_TYPES_H) && PJ_HAS_SYS_TYPES_H != 0