diff options
Diffstat (limited to 'pjlib/include/pj/compat/socket.h')
| -rw-r--r-- | pjlib/include/pj/compat/socket.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pjlib/include/pj/compat/socket.h b/pjlib/include/pj/compat/socket.h index f173e8f8..e132e647 100644 --- a/pjlib/include/pj/compat/socket.h +++ b/pjlib/include/pj/compat/socket.h @@ -32,6 +32,11 @@ # include <winsock.h> #endif +#if defined(PJ_HAS_WS2TCPIP_H) && PJ_HAS_WS2TCPIP_H != 0 +# include <ws2tcpip.h> +#endif + + /* * IPv6 for Visual Studio's * @@ -58,9 +63,6 @@ # define s_addr S_un.S_addr # endif -# include <ws2tcpip.h> -# 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,11 +73,6 @@ # 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> #endif |