Ignore:
Timestamp:
Sep 27, 2008 1:16:35 PM (13 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:
1 edited

Legend:

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

    r2330 r2331  
    3232#  include <winsock.h> 
    3333#endif 
     34 
     35#if defined(PJ_HAS_WS2TCPIP_H) && PJ_HAS_WS2TCPIP_H != 0 
     36#   include <ws2tcpip.h> 
     37#endif 
     38 
    3439 
    3540/* 
     
    5964#   endif 
    6065 
    61 #   include <ws2tcpip.h> 
    62 #   define PJ_WS2TCPIP_H_INCLUDED 
    63  
    6466#   if !defined(IPPROTO_IPV6) 
    6567        /* Need to download and install IPv6Kit for this platform. 
     
    7173#   define PJ_SOCK_HAS_GETADDRINFO  1 
    7274#endif  /* _MSC_VER */ 
    73  
    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 
    7875 
    7976#if defined(PJ_HAS_SYS_TYPES_H) && PJ_HAS_SYS_TYPES_H != 0 
Note: See TracChangeset for help on using the changeset viewer.