andrey Thu Nov 6 14:20:19 2008 UTC
Modified files:
/php-src/ext/mysqlnd config-win.h mysqlnd_portability.h
Log:
Rely on win32/php_stdint.h on Windows for stdint types
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config-win.h?r1=1.4&r2=1.5&diff_format=u
Index: php-src/ext/mysqlnd/config-win.h
diff -u php-src/ext/mysqlnd/config-win.h:1.4
php-src/ext/mysqlnd/config-win.h:1.5
--- php-src/ext/mysqlnd/config-win.h:1.4 Thu Nov 6 11:26:07 2008
+++ php-src/ext/mysqlnd/config-win.h Thu Nov 6 14:20:19 2008
@@ -10,6 +10,33 @@
#include <io.h>
#include <malloc.h>
+#include "win32/php_stdint.h"
+
+#ifndef HAVE_INT8_T
+#define HAVE_INT8_T
+#endif
+#ifndef HAVE_UINT8_T
+#define HAVE_UINT8_T
+#endif
+#ifndef HAVE_INT16_T
+#define HAVE_INT16_T
+#endif
+#ifndef HAVE_UINT16_T
+#define HAVE_UINT16_T
+#endif
+#ifndef HAVE_INT32_T
+#define HAVE_INT32_T
+#endif
+#ifndef HAVE_UINT32_T
+#define HAVE_UINT32_T
+#endif
+#ifndef HAVE_INT64_T
+#define HAVE_INT64_T
+#endif
+#ifndef HAVE_UINT64_T
+#define HAVE_UINT64_T
+#endif
+
#ifndef _WIN64
#ifndef _WIN32
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_portability.h?r1=1.12&r2=1.13&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_portability.h
diff -u php-src/ext/mysqlnd/mysqlnd_portability.h:1.12
php-src/ext/mysqlnd/mysqlnd_portability.h:1.13
--- php-src/ext/mysqlnd/mysqlnd_portability.h:1.12 Thu Nov 6 10:36:30 2008
+++ php-src/ext/mysqlnd/mysqlnd_portability.h Thu Nov 6 14:20:19 2008
@@ -60,7 +60,7 @@
#endif
/* Typdefs for easyier portability */
-
+#if 0
#ifndef HAVE_INT8_T
#ifndef HAVE_INT8
typedef signed char int8_t; /* Signed integer >= 8 bits
*/
@@ -69,7 +69,6 @@
#endif
#endif
-
#ifndef HAVE_UINT8_T
#ifndef HAVE_UINT8
typedef unsigned char uint8_t; /* Unsigned integer >= 8 bits */
@@ -110,7 +109,6 @@
#endif
#endif /* HAVE_INT32_T */
-
#ifndef HAVE_UINT32_T
#ifdef HAVE_UINT32
typedef uint32 uint32_t;
@@ -123,7 +121,6 @@
#endif
#endif /* HAVE_UINT32_T */
-
#ifndef HAVE_INT64_T
#ifdef HAVE_INT64
typedef int64 int64_t;
@@ -142,7 +139,6 @@
#endif
#endif /* HAVE_INT64_T */
-
#ifndef HAVE_UINT64_T
#ifdef HAVE_UINT64
typedef uint64 uint64_t;
@@ -161,6 +157,7 @@
#endif
#endif /* HAVE_INT64_T */
+#endif
#ifdef PHP_WIN32
#define MYSQLND_LLU_SPEC "%I64u"
@@ -179,7 +176,7 @@
#endif
-#define int1store(T,A) do { *((zend_uchar*) (T)) = (A); } while(0)
+#define int1store(T,A) do { *((int8_t*) (T)) = (A); } while(0)
#define uint1korr(A) (*(((uint8_t*)(A))))
/* Bit values are sent in reverted order of bytes, compared to normal !!! */
@@ -231,7 +228,7 @@
** (low byte first)
*/
-/* Optimized store functions for Intel x86, non-valid for WIN64 */
+/* Optimized store functions for Intel x86, non-valid for WIN64. __i386__ is
GCC */
#if defined(__i386__) && !defined(_WIN64)
#define sint2korr(A) (*((int16_t *) (A)))
#define sint3korr(A) ((int32_t) ((((uchar) (A)[2]) & 128) ? \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
