diff options
| author | Pierre Joye <pajoye@php.net> | 2008-08-23 19:22:10 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2008-08-23 19:22:10 +0000 |
| commit | 2620304003d8e004ac3fc93d8293b5b575514f44 (patch) | |
| tree | 5d61491d9769d05a2efa93c2e2e68bcba547a94a /main | |
| parent | 847284086bddcd5fd31eaa4869ec0d521dfd7289 (diff) | |
| download | php-git-2620304003d8e004ac3fc93d8293b5b575514f44.tar.gz | |
- MFH:
- drop bindlib usage on windows
- inet_pton, inet_ntop and inet_aton are always available (VC9 uses the CRT implementation, VC6 our own)
Diffstat (limited to 'main')
| -rw-r--r-- | main/network.c | 5 | ||||
| -rw-r--r-- | main/php_network.h | 15 |
2 files changed, 4 insertions, 16 deletions
diff --git a/main/network.c b/main/network.c index 782224eda8..d8824fd81e 100644 --- a/main/network.c +++ b/main/network.c @@ -26,8 +26,9 @@ #include <stddef.h> #ifdef PHP_WIN32 -#define O_RDONLY _O_RDONLY -#include "win32/param.h" +# include "win32/inet.h" +# define O_RDONLY _O_RDONLY +# include "win32/param.h" #elif defined(NETWARE) #include <sys/timeval.h> #include <sys/param.h> diff --git a/main/php_network.h b/main/php_network.h index f5db18f836..a9a0d56831 100644 --- a/main/php_network.h +++ b/main/php_network.h @@ -22,20 +22,7 @@ #define _PHP_NETWORK_H #ifdef PHP_WIN32 -# ifndef WINNT -# define WINNT 1 -# endif -# undef FD_SETSIZE -# include "arpa/inet.h" - /* Apache folks decided that strtoul was evil and redefined - * it to something that breaks the windows headers */ -# undef strtoul -/* defines socklen_t and some IPV6 stuff */ -# include <ws2tcpip.h> -# if HAVE_WSPIAPI_H - /* getaddrinfo */ -# include <wspiapi.h> -# endif +# include "win32/inet.h" #else # undef closesocket # define closesocket close |