diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-09-27 09:35:34 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-09-27 09:35:34 +0000 |
| commit | fd557a69a1d827dcf04a596f0d4bb222101e3e21 (patch) | |
| tree | 4a25b5079de30af3bad4447ffaa416778011bd40 /pjlib/include | |
| parent | 0274356c3684e840b80c2861cf9f31c15e99e08c (diff) | |
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.
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2327 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/include')
| -rw-r--r-- | pjlib/include/pj/compat/socket.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pjlib/include/pj/compat/socket.h b/pjlib/include/pj/compat/socket.h index d234aca2..f173e8f8 100644 --- a/pjlib/include/pj/compat/socket.h +++ b/pjlib/include/pj/compat/socket.h @@ -53,14 +53,15 @@ * These VS uses Microsoft Platform SDK for Windows Server 2003 SP1, and * 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 # endif # include <ws2tcpip.h> +# define PJ_WS2TCPIP_H_INCLUDED -# if !defined(IPPROTO_IPV6) && defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0 +# if !defined(IPPROTO_IPV6) /* Need to download and install IPv6Kit for this platform. * Please see the comments above about Visual Studio 6. */ @@ -70,6 +71,10 @@ # 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 # include <sys/types.h> |