rrichards Wed Jan 9 11:23:25 2008 UTC
Modified files:
/php-src/ext/mysqlnd mysqlnd_portability.h
Log:
fix win32 compile
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_portability.h?r1=1.7&r2=1.8&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_portability.h
diff -u php-src/ext/mysqlnd/mysqlnd_portability.h:1.7
php-src/ext/mysqlnd/mysqlnd_portability.h:1.8
--- php-src/ext/mysqlnd/mysqlnd_portability.h:1.7 Wed Jan 2 21:16:46 2008
+++ php-src/ext/mysqlnd/mysqlnd_portability.h Wed Jan 9 11:23:25 2008
@@ -132,7 +132,11 @@
#elif SIZEOF_LONG == 8
typedef signed long int64;
#elif SIZEOF_LONG_LONG == 8
+#ifdef PHP_WIN32
+typedef __int64 int64;
+#else
typedef signed long long int64;
+#endif
#else
#error "Neither int nor long nor long long is of 8 bytes width"
#endif
@@ -147,7 +151,11 @@
#elif SIZEOF_LONG == 8
typedef unsigned long uint64;
#elif SIZEOF_LONG_LONG == 8
+#ifdef PHP_WIN32
+typedef unsigned __int64 uint64;
+#else
typedef unsigned long long uint64;
+#endif
#else
#error "Neither int nor long nor long long is of 8 bytes width"
#endif
@@ -160,8 +168,6 @@
#ifndef L64
#define L64(x) x##i64
#endif
-typedef __int64 int64;
-typedef unsigned __int64 uint64;
#else
#define MYSQLND_LLU_SPEC "%llu"
#define MYSQLND_LL_SPEC "%lld"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
