diff options
| author | Andrey Hristov <andrey@php.net> | 2008-11-06 11:29:20 +0000 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2008-11-06 11:29:20 +0000 |
| commit | e099d732a68b46ed2c9acab856b906214dddea58 (patch) | |
| tree | 79746b63ad3faff29db88decf6921641ea32aeb5 /ext | |
| parent | ef3ce03e5e29b9b67605ffb2cb8c2e74398494cb (diff) | |
| download | php-git-e099d732a68b46ed2c9acab856b906214dddea58.tar.gz | |
MFH: More cleanup of config-win.h
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/mysqlnd/config-win.h | 19 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_portability.h | 2 |
2 files changed, 2 insertions, 19 deletions
diff --git a/ext/mysqlnd/config-win.h b/ext/mysqlnd/config-win.h index 485f88258c..0d890f7166 100644 --- a/ext/mysqlnd/config-win.h +++ b/ext/mysqlnd/config-win.h @@ -10,13 +10,6 @@ This file is public domain and comes with NO WARRANTY of any kind */ #include <io.h> #include <malloc.h> -#if defined(__NT__) -#define SYSTEM_TYPE "NT" -#elif defined(__WIN2000__) -#define SYSTEM_TYPE "WIN2000" -#else -#define SYSTEM_TYPE "Win95/Win98" -#endif #ifndef _WIN64 #ifndef _WIN32 @@ -27,21 +20,11 @@ This file is public domain and comes with NO WARRANTY of any kind */ #endif #endif /* _WIN64 */ #ifndef __WIN__ -#define __WIN__ /* To make it easier in VC++ */ +#define __WIN__ /* To make it easier in VC++ */ #endif -#define LONGLONG_MIN ((__int64) 0x8000000000000000) -#define LONGLONG_MAX ((__int64) 0x7FFFFFFFFFFFFFFF) -#define LL(A) ((__int64) A) - /* Type information */ -/* -typedef unsigned int uint; -*/ -typedef int sigset_t; -#define longlong_defined - #define SIZEOF_CHAR 1 #define SIZEOF_LONG 4 #define SIZEOF_LONG_LONG 8 diff --git a/ext/mysqlnd/mysqlnd_portability.h b/ext/mysqlnd/mysqlnd_portability.h index cdc6273397..9219fc3302 100644 --- a/ext/mysqlnd/mysqlnd_portability.h +++ b/ext/mysqlnd/mysqlnd_portability.h @@ -231,7 +231,7 @@ typedef unsigned long long uint64_t; ** (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) ? \ |