summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorRob Richards <rrichards@php.net>2008-01-09 11:23:59 +0000
committerRob Richards <rrichards@php.net>2008-01-09 11:23:59 +0000
commit9238ee440f661530bb58c2a499dc2bb5ae9d58c6 (patch)
tree216e0553a7e63cfad85406236e226798c1d71728 /ext
parent686f30d1180b0ede18243f59fe7c5df15c79e7e1 (diff)
downloadphp-git-9238ee440f661530bb58c2a499dc2bb5ae9d58c6.tar.gz
MFH: fix win32 compile
Diffstat (limited to 'ext')
-rw-r--r--ext/mysqlnd/mysqlnd_portability.h10
1 files changed, 8 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_portability.h b/ext/mysqlnd/mysqlnd_portability.h
index 687c6d9b1f..049aa9707a 100644
--- a/ext/mysqlnd/mysqlnd_portability.h
+++ b/ext/mysqlnd/mysqlnd_portability.h
@@ -132,7 +132,11 @@ typedef signed int int64;
#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 @@ typedef unsigned int uint64;
#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 @@ typedef unsigned long long uint64;
#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"