Changeset 2327


Ignore:
Timestamp:
Sep 27, 2008 9:35:34 AM (11 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:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjlib/include/pj/compat/socket.h

    r2283 r2327  
    5454 * it has built-in IPv6 support. 
    5555 */ 
    56 #if defined(_MSC_VER) 
     56#if defined(_MSC_VER) && defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0 
    5757#   ifndef s_addr 
    5858#       define s_addr  S_un.S_addr 
     
    6060 
    6161#   include <ws2tcpip.h> 
    62  
    63 #   if !defined(IPPROTO_IPV6) && defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0 
     62#   define PJ_WS2TCPIP_H_INCLUDED 
     63 
     64#   if !defined(IPPROTO_IPV6) 
    6465        /* Need to download and install IPv6Kit for this platform. 
    6566         * Please see the comments above about Visual Studio 6. 
     
    7172#endif  /* _MSC_VER */ 
    7273 
     74/* Mingw32 needs ws2tcpip.h for the IGMP constants */ 
     75#if defined(__GNUC__) && defined(WIN32) && !defined(PJ_WS2TCPIP_H_INCLUDED) 
     76#   include <ws2tcpip.h> 
     77#endif 
    7378 
    7479#if defined(PJ_HAS_SYS_TYPES_H) && PJ_HAS_SYS_TYPES_H != 0 
  • pjproject/trunk/pjlib/src/pj/sock_bsd.c

    r2283 r2327  
    116116const pj_uint16_t PJ_SO_RCVBUF  = SO_RCVBUF; 
    117117const pj_uint16_t PJ_SO_SNDBUF  = SO_SNDBUF; 
    118 const pj_uint16_t pj_IP_MULTICAST_IF    = IP_MULTICAST_IF; 
    119 const pj_uint16_t pj_IP_MULTICAST_TTL   = IP_MULTICAST_TTL; 
    120 const pj_uint16_t pj_IP_MULTICAST_LOOP  = IP_MULTICAST_LOOP; 
    121 const pj_uint16_t pj_IP_ADD_MEMBERSHIP  = IP_ADD_MEMBERSHIP; 
    122 const pj_uint16_t pj_IP_DROP_MEMBERSHIP = IP_DROP_MEMBERSHIP; 
     118const pj_uint16_t PJ_IP_MULTICAST_IF    = IP_MULTICAST_IF; 
     119const pj_uint16_t PJ_IP_MULTICAST_TTL   = IP_MULTICAST_TTL; 
     120const pj_uint16_t PJ_IP_MULTICAST_LOOP  = IP_MULTICAST_LOOP; 
     121const pj_uint16_t PJ_IP_ADD_MEMBERSHIP  = IP_ADD_MEMBERSHIP; 
     122const pj_uint16_t PJ_IP_DROP_MEMBERSHIP = IP_DROP_MEMBERSHIP; 
    123123 
    124124 
  • pjproject/trunk/pjlib/src/pj/sock_symbian.cpp

    r2283 r2327  
    6767 
    6868/* IP multicast is also not supported. */ 
    69 const pj_uint16_t pj_IP_MULTICAST_IF    = 0xFFFF; 
    70 const pj_uint16_t pj_IP_MULTICAST_TTL   = 0xFFFF; 
    71 const pj_uint16_t pj_IP_MULTICAST_LOOP  = 0xFFFF; 
    72 const pj_uint16_t pj_IP_ADD_MEMBERSHIP  = 0xFFFF; 
    73 const pj_uint16_t pj_IP_DROP_MEMBERSHIP = 0xFFFF; 
     69const pj_uint16_t PJ_IP_MULTICAST_IF    = 0xFFFF; 
     70const pj_uint16_t PJ_IP_MULTICAST_TTL   = 0xFFFF; 
     71const pj_uint16_t PJ_IP_MULTICAST_LOOP  = 0xFFFF; 
     72const pj_uint16_t PJ_IP_ADD_MEMBERSHIP  = 0xFFFF; 
     73const pj_uint16_t PJ_IP_DROP_MEMBERSHIP = 0xFFFF; 
    7474 
    7575/* Flags */ 
Note: See TracChangeset for help on using the changeset viewer.