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

Timestamp:

Sep 27, 2008 9:35:34 AM (16 years ago)

Author:

bennylp

Message:

Fixed ticket #644 and #648: incorrect muticast related socket constant names, missing ws2tcpip.h include causing build error on Mingw, and error building on Visual Studio 6 due to PJ_SOCK_HAS_GETADDRINFO being declared accidentally.

File:

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

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

@@ -54 +54 @@
  * it has built-in IPv6 support.
  */
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
 #   ifndef s_addr
 #       define s_addr  S_un.S_addr
@@ -60 +60 @@
 
 #   include <ws2tcpip.h>
-
-#   if !defined(IPPROTO_IPV6) && defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0
+#   define PJ_WS2TCPIP_H_INCLUDED
+
+#   if !defined(IPPROTO_IPV6)
         /* Need to download and install IPv6Kit for this platform.
          * Please see the comments above about Visual Studio 6.
@@ -71 +72 @@
 #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