pajoye          Tue Jan 27 21:53:31 2009 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/win32      php_stdint.h 
  Log:
  - prevent redefinition
  
http://cvs.php.net/viewvc.cgi/php-src/win32/php_stdint.h?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/win32/php_stdint.h
diff -u php-src/win32/php_stdint.h:1.1.2.3 php-src/win32/php_stdint.h:1.1.2.4
--- php-src/win32/php_stdint.h:1.1.2.3  Wed Dec 31 11:15:49 2008
+++ php-src/win32/php_stdint.h  Tue Jan 27 21:53:31 2009
@@ -68,12 +68,22 @@
 // 7.18.1.1 Exact-width integer types
 typedef __int8            int8_t;
 typedef __int16           int16_t;
+#ifndef int32_t
 typedef __int32           int32_t;
+#endif
+#ifndef int64_t
 typedef __int64           int64_t;
+#endif
+#ifndef uint8_t
 typedef unsigned __int8   uint8_t;
+#endif
+#ifndef u_char
 typedef unsigned __int8   u_char;
+#endif
 typedef unsigned __int16  uint16_t;
+#ifndef uint32_t
 typedef unsigned __int32  uint32_t;
+#endif
 typedef unsigned __int64  uint64_t;
 
 // 7.18.1.2 Minimum-width integer types



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

Reply via email to