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 /ext/standard/dns.c | |
| 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 'ext/standard/dns.c')
| -rw-r--r-- | ext/standard/dns.c | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/ext/standard/dns.c b/ext/standard/dns.c index f559f79572..39412adc86 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -29,23 +29,10 @@ #endif #ifdef PHP_WIN32 -#if HAVE_LIBBIND -#ifndef WINNT -#define WINNT 1 -#endif -/* located in www.php.net/extra/bindlib.zip */ -#if HAVE_ARPA_INET_H -#include "arpa/inet.h" -#endif -#include "netdb.h" -#if HAVE_ARPA_NAMESERV_H -#include "arpa/nameser.h" -#endif -#if HAVE_RESOLV_H -#include "resolv.h" -#endif -#endif /* HAVE_LIBBIND */ -#include <winsock2.h> +# include "win32/inet.h" +# include <winsock2.h> +# include <windows.h> +# include <Ws2tcpip.h> #else /* This holds good for NetWare too, both for Winsock and Berkeley sockets */ #include <netinet/in.h> #if HAVE_ARPA_INET_H |