- bump minimum version, no more XP/2003

diff --git a/main/network.c b/main/network.c
index 6c7031f983cc00981518f9759a8010f410a04a42..b8380b00d9003a9589f1a47f9fba1225bf4b4ae9 100644 (file)
--- a/main/network.c
+++ b/main/network.c
@@ -25,7 +25,10 @@
 
 #include <stddef.h>
 
+
+
 #ifdef PHP_WIN32
+# include <Ws2tcpip.h>
 # include "win32/inet.h"
 # define O_RDONLY _O_RDONLY
 # include "win32/param.h"

diff --git a/win32/build/config.w32.h.in b/win32/build/config.w32.h.in
index 13b36fad1cc58cdc4bf42939bb209a19db6ee4bb..9efdfdea3ea5739832d66bde8ba89ceca52c887d 100644 (file)
--- 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 b794bcaeb45d23fdeae2bf711567942a3c24c784..d424c8a5468b74b63b259e5a73dab25bbf302934 100644 (file)
--- 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 e96d76b24a888a693150cf5121b5e021a6930f1a..623d114dfd584f15548d25eb91e8185dbd6014c9 100644 (file)
--- 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 c4969ad5e3a8572e4c6e2261358f60efa47b8f32..4b09697e95dfe7fa3000a606bcdd86470db48823 100644 (file)
--- 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 */