MFH: More cleanup of config-win.h

diff --git a/ext/mysqlnd/config-win.h b/ext/mysqlnd/config-win.h
index 485f88258c3dec4bb57e42d2e519b7bcf1e0ac35..0d890f7166309c25319a855060cf1b07d860d580 100644 (file)
--- 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 cdc627339780b327e627f1c2c5bb8601bb55a203..9219fc3302af2ad44e53951cc4ebd9ac4d789cec 100644 (file)
--- 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) ? \