diff options
| author | Andrey Hristov <andrey@php.net> | 2008-11-06 14:21:50 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-11-06 14:21:50 +0000 |
| commit | e49366850ff01e820cb665f9f83922c92a359e9b (patch) | |
| tree | bd285ae90f6aaa92eb97d4e775cf11ff5155755c /ext | |
| parent | 710638db5457c6267da526915efa9c840ce8debe (diff) | |
| download | php-git-e49366850ff01e820cb665f9f83922c92a359e9b.tar.gz | |
MFH: Use win32/php_stdint.h for stdint types on Windows
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysqlnd/config-win.h | 27 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_portability.h | 6 |
2 files changed, 28 insertions, 5 deletions
diff --git a/ext/mysqlnd/config-win.h b/ext/mysqlnd/config-win.h index 0d890f7166..15cd736b10 100644 --- a/ext/mysqlnd/config-win.h +++ b/ext/mysqlnd/config-win.h @@ -10,6 +10,33 @@ This file is public domain and comes with NO WARRANTY of any kind */ #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 diff --git a/ext/mysqlnd/mysqlnd_portability.h b/ext/mysqlnd/mysqlnd_portability.h index 9219fc3302..09a52f4dda 100644 --- a/ext/mysqlnd/mysqlnd_portability.h +++ b/ext/mysqlnd/mysqlnd_portability.h @@ -69,7 +69,6 @@ typedef int8 int8_t; /* Signed integer >= 8 bits */ #endif #endif - #ifndef HAVE_UINT8_T #ifndef HAVE_UINT8 typedef unsigned char uint8_t; /* Unsigned integer >= 8 bits */ @@ -110,7 +109,6 @@ error "Neither int nor long is of 4 bytes width" #endif #endif /* HAVE_INT32_T */ - #ifndef HAVE_UINT32_T #ifdef HAVE_UINT32 typedef uint32 uint32_t; @@ -123,7 +121,6 @@ typedef unsigned long uint32_t; #endif #endif /* HAVE_UINT32_T */ - #ifndef HAVE_INT64_T #ifdef HAVE_INT64 typedef int64 int64_t; @@ -142,7 +139,6 @@ typedef signed long long int64_t; #endif #endif /* HAVE_INT64_T */ - #ifndef HAVE_UINT64_T #ifdef HAVE_UINT64 typedef uint64 uint64_t; @@ -179,7 +175,7 @@ typedef unsigned long long uint64_t; #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 !!! */ |