* Remove NTDDI_VERSION declaring and use the one in config.w32.h

* Remove another _WIN32_WINNT macro redef in win32/time.c

diff --git a/main/php.h b/main/php.h
index ae70c5c15099f86b474130cb3e0132c1d6653175..ebfda96c18616c35bfe11cfd025da31dabcabd3a 100644 (file)
--- a/main/php.h
+++ b/main/php.h
@@ -54,12 +54,6 @@
 #      endif
 #      define PHP_DIR_SEPARATOR '\\'
 #      define PHP_EOL "\r\n"
-#      if defined(NTDDI_VERSION) && NTDDI_VERSION >= 0x06000000
-#              undef NTDDI_VERSION
-#      endif
-#      ifndef NTDDI_VERSION
-#              define NTDDI_VERSION 0x05000000
-#      endif
 #else
 #      if defined(__GNUC__) && __GNUC__ >= 4
 #              define PHPAPI __attribute__ ((visibility("default")))

diff --git a/win32/time.c b/win32/time.c
index 693f07418536ed0a6273208d4cddaa49d112d249..a704ab99040b9f39b7ca8390857aa4dea4c7ead7 100644 (file)
--- a/win32/time.c
+++ b/win32/time.c
@@ -22,10 +22,6 @@
 
 /* Include stuff ************************************************************ */
 
-/* this allows the use of the WaitableTimer functions.
- * For win98 and later */
-#define _WIN32_WINNT 0x400
-
 #include "time.h"
 #include "unistd.h"
 #include "signal.h"