pajoye                                   Wed, 17 Aug 2011 11:56:04 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=315061

Log:
- use provided stdint.h and avoid double definitions

Changed paths:
    U   php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h
    U   php/php-src/trunk/sapi/cli/php_http_parser.h

Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h
===================================================================
--- php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h     2011-08-17 
11:52:31 UTC (rev 315060)
+++ php/php-src/branches/PHP_5_4/sapi/cli/php_http_parser.h     2011-08-17 
11:56:04 UTC (rev 315061)
@@ -28,17 +28,7 @@

 #include <sys/types.h>
 #if defined(_WIN32) && !defined(__MINGW32__)
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-
-typedef unsigned int size_t;
-typedef int ssize_t;
+#include "win32/php_stdint.h"
 #else
 #include <stdint.h>
 #endif

Modified: php/php-src/trunk/sapi/cli/php_http_parser.h
===================================================================
--- php/php-src/trunk/sapi/cli/php_http_parser.h        2011-08-17 11:52:31 UTC 
(rev 315060)
+++ php/php-src/trunk/sapi/cli/php_http_parser.h        2011-08-17 11:56:04 UTC 
(rev 315061)
@@ -28,17 +28,7 @@

 #include <sys/types.h>
 #if defined(_WIN32) && !defined(__MINGW32__)
-typedef __int8 int8_t;
-typedef unsigned __int8 uint8_t;
-typedef __int16 int16_t;
-typedef unsigned __int16 uint16_t;
-typedef __int32 int32_t;
-typedef unsigned __int32 uint32_t;
-typedef __int64 int64_t;
-typedef unsigned __int64 uint64_t;
-
-typedef unsigned int size_t;
-typedef int ssize_t;
+#include "win32/php_stdint.h"
 #else
 #include <stdint.h>
 #endif

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

Reply via email to