diff options
| author | Benny Prijono <bennylp@teluu.com> | 2008-09-27 13:16:35 +0000 |
|---|---|---|
| committer | Benny Prijono <bennylp@teluu.com> | 2008-09-27 13:16:35 +0000 |
| commit | 3f954489680fbf68d80a1f919f7c258b866db056 (patch) | |
| tree | a576b59e1b96f588a8376c87f0784eb2540b45e3 /pjlib/include | |
| parent | 69c33be41a35252c9d9b3782b78ef7e65ad8a3b8 (diff) | |
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
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@2331 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjlib/include')
| -rw-r--r-- | pjlib/include/pj/compat/os_auto.h.in | 1 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/os_win32.h | 1 | ||||
| -rw-r--r-- | pjlib/include/pj/compat/socket.h | 13 |
3 files changed, 7 insertions, 8 deletions
diff --git a/pjlib/include/pj/compat/os_auto.h.in b/pjlib/include/pj/compat/os_auto.h.in index d9b37d28..8c65c8f9 100644 --- a/pjlib/include/pj/compat/os_auto.h.in +++ b/pjlib/include/pj/compat/os_auto.h.in @@ -75,6 +75,7 @@ #undef PJ_HAS_MSWSOCK_H #undef PJ_HAS_WINSOCK_H #undef PJ_HAS_WINSOCK2_H +#undef PJ_HAS_WS2TCPIP_H #undef PJ_SOCK_HAS_INET_ATON #undef PJ_SOCK_HAS_INET_PTON diff --git a/pjlib/include/pj/compat/os_win32.h b/pjlib/include/pj/compat/os_win32.h index 52ac49bd..2d988042 100644 --- a/pjlib/include/pj/compat/os_win32.h +++ b/pjlib/include/pj/compat/os_win32.h @@ -59,6 +59,7 @@ #define PJ_HAS_MSWSOCK_H 1 #define PJ_HAS_WINSOCK_H 0 #define PJ_HAS_WINSOCK2_H 1 +#define PJ_HAS_WS2TCPIP_H 1 #define PJ_SOCK_HAS_INET_ATON 0 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 |