kalle           Wed Aug 13 22:40:39 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/main       php.h 
    /php-src/win32      time.c 
  Log:
  MFH:
  * Remove NTDDI_VERSION declaring and use the one in config.w32.h
  * Remove another _WIN32_WINNT macro redef in win32/time.c
  
http://cvs.php.net/viewvc.cgi/php-src/main/php.h?r1=1.221.2.4.2.8.2.8&r2=1.221.2.4.2.8.2.9&diff_format=u
Index: php-src/main/php.h
diff -u php-src/main/php.h:1.221.2.4.2.8.2.8 
php-src/main/php.h:1.221.2.4.2.8.2.9
--- php-src/main/php.h:1.221.2.4.2.8.2.8        Fri Aug  8 17:47:24 2008
+++ php-src/main/php.h  Wed Aug 13 22:40:39 2008
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php.h,v 1.221.2.4.2.8.2.8 2008/08/08 17:47:24 helly Exp $ */
+/* $Id: php.h,v 1.221.2.4.2.8.2.9 2008/08/13 22:40:39 kalle Exp $ */
 
 #ifndef PHP_H
 #define 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")))
http://cvs.php.net/viewvc.cgi/php-src/win32/time.c?r1=1.10&r2=1.10.6.1&diff_format=u
Index: php-src/win32/time.c
diff -u php-src/win32/time.c:1.10 php-src/win32/time.c:1.10.6.1
--- php-src/win32/time.c:1.10   Thu Jul 29 02:59:43 2004
+++ php-src/win32/time.c        Wed Aug 13 22:40:39 2008
@@ -11,7 +11,7 @@
  *
  *****************************************************************************/
 
-/* $Id: time.c,v 1.10 2004/07/29 02:59:43 wez Exp $ */
+/* $Id: time.c,v 1.10.6.1 2008/08/13 22:40:39 kalle Exp $ */
 
  /**
   *
@@ -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"



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to