Changeset 2327

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.

Location:

pjproject/trunk/pjlib

Files:

• include/pj/compat/socket.h (modified) (3 diffs)
• src/pj/sock_bsd.c (modified) (1 diff)
• src/pj/sock_symbian.cpp (modified) (1 diff)

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

pjproject/trunk/pjlib/src/pj/sock_bsd.c

@@ -116 +116 @@
 const pj_uint16_t PJ_SO_RCVBUF  = SO_RCVBUF;
 const pj_uint16_t PJ_SO_SNDBUF  = SO_SNDBUF;
-const pj_uint16_t pj_IP_MULTICAST_IF    = IP_MULTICAST_IF;
-const pj_uint16_t pj_IP_MULTICAST_TTL   = IP_MULTICAST_TTL;
-const pj_uint16_t pj_IP_MULTICAST_LOOP  = IP_MULTICAST_LOOP;
-const pj_uint16_t pj_IP_ADD_MEMBERSHIP  = IP_ADD_MEMBERSHIP;
-const pj_uint16_t pj_IP_DROP_MEMBERSHIP = IP_DROP_MEMBERSHIP;
+const pj_uint16_t PJ_IP_MULTICAST_IF    = IP_MULTICAST_IF;
+const pj_uint16_t PJ_IP_MULTICAST_TTL   = IP_MULTICAST_TTL;
+const pj_uint16_t PJ_IP_MULTICAST_LOOP  = IP_MULTICAST_LOOP;
+const pj_uint16_t PJ_IP_ADD_MEMBERSHIP  = IP_ADD_MEMBERSHIP;
+const pj_uint16_t PJ_IP_DROP_MEMBERSHIP = IP_DROP_MEMBERSHIP;
 
 

pjproject/trunk/pjlib/src/pj/sock_symbian.cpp

@@ -67 +67 @@
 
 /* IP multicast is also not supported. */
-const pj_uint16_t pj_IP_MULTICAST_IF    = 0xFFFF;
-const pj_uint16_t pj_IP_MULTICAST_TTL   = 0xFFFF;
-const pj_uint16_t pj_IP_MULTICAST_LOOP  = 0xFFFF;
-const pj_uint16_t pj_IP_ADD_MEMBERSHIP  = 0xFFFF;
-const pj_uint16_t pj_IP_DROP_MEMBERSHIP = 0xFFFF;
+const pj_uint16_t PJ_IP_MULTICAST_IF    = 0xFFFF;
+const pj_uint16_t PJ_IP_MULTICAST_TTL   = 0xFFFF;
+const pj_uint16_t PJ_IP_MULTICAST_LOOP  = 0xFFFF;
+const pj_uint16_t PJ_IP_ADD_MEMBERSHIP  = 0xFFFF;
+const pj_uint16_t PJ_IP_DROP_MEMBERSHIP = 0xFFFF;
 
 /* Flags */