diff options
| author | Pierre Joye <pajoye@php.net> | 2012-03-04 15:08:12 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2012-03-04 15:08:12 +0000 |
| commit | 94994104a54a57ee3ff2a143a1f6c43850589378 (patch) | |
| tree | 1110b64c3c8c36adc351caa6e6eab699a5e7afc7 /win32 | |
| parent | 4e2e632fbdd587de502b4db603b1e15a2176a633 (diff) | |
| download | php-git-94994104a54a57ee3ff2a143a1f6c43850589378.tar.gz | |
- bump minimum version, no more XP/2003
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/config.w32.h.in | 4 | ||||
| -rw-r--r-- | win32/inet.c | 6 | ||||
| -rw-r--r-- | win32/inet.h | 3 | ||||
| -rw-r--r-- | win32/sendmail.c | 1 |
4 files changed, 9 insertions, 5 deletions
diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in index 13b36fad1c..9efdfdea3e 100644 --- a/win32/build/config.w32.h.in +++ b/win32/build/config.w32.h.in @@ -6,8 +6,8 @@ /* Define the minimum supported version */ #undef _WIN32_WINNT #undef NTDDI_VERSION -#define _WIN32_WINNT 0x502 -#define NTDDI_VERSION _WIN32_WIN2K +#define _WIN32_WINNT 0x0600 +#define NTDDI_VERSION 0x06000100 /* Default PHP / PEAR directories */ #define PHP_CONFIG_FILE_PATH (getenv("SystemRoot"))?getenv("SystemRoot"):"" diff --git a/win32/inet.c b/win32/inet.c index b794bcaeb4..d424c8a546 100644 --- a/win32/inet.c +++ b/win32/inet.c @@ -1,11 +1,12 @@ #include "config.w32.h" -#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */ #include "php.h" #include <winsock2.h> #include <windows.h> #include <Ws2tcpip.h> #include "inet.h" +#if (_WIN32_WINNT < 0x0600) /* Vista/2k8 have these functions */ + PHPAPI int inet_pton(int af, const char* src, void* dst) { @@ -76,6 +77,8 @@ PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size) return NULL; } +#endif + int inet_aton(const char *cp, struct in_addr *inp) { inp->s_addr = inet_addr(cp); @@ -85,4 +88,3 @@ int inet_aton(const char *cp, struct in_addr *inp) { return 1; } -#endif diff --git a/win32/inet.h b/win32/inet.h index e96d76b24a..623d114dfd 100644 --- a/win32/inet.h +++ b/win32/inet.h @@ -6,5 +6,6 @@ #if (_WIN32_WINNT <= 0x502) PHPAPI int inet_pton(int af, const char* src, void* dst); PHPAPI const char* inet_ntop(int af, const void* src, char* dst, size_t size); -PHPAPI int inet_aton(const char *cp, struct in_addr *inp); #endif + +PHPAPI int inet_aton(const char *cp, struct in_addr *inp); diff --git a/win32/sendmail.c b/win32/sendmail.c index c4969ad5e3..4b09697e95 100644 --- a/win32/sendmail.c +++ b/win32/sendmail.c @@ -25,6 +25,7 @@ #ifndef NETWARE #include <winsock2.h> #include "time.h" +# include <Ws2tcpip.h> #else /* NETWARE */ #include <netware/sendmail_nw.h> #endif /* NETWARE */ |