andrey Thu Nov 6 11:29:20 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/mysqlnd config-win.h mysqlnd_portability.h
Log:
MFH: More cleanup of config-win.h
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/config-win.h?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/ext/mysqlnd/config-win.h
diff -u php-src/ext/mysqlnd/config-win.h:1.1.2.4
php-src/ext/mysqlnd/config-win.h:1.1.2.5
--- php-src/ext/mysqlnd/config-win.h:1.1.2.4 Thu Nov 6 10:37:47 2008
+++ php-src/ext/mysqlnd/config-win.h Thu Nov 6 11:29:20 2008
@@ -10,13 +10,6 @@
#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 @@
#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
http://cvs.php.net/viewvc.cgi/php-src/ext/mysqlnd/mysqlnd_portability.h?r1=1.4.2.8&r2=1.4.2.9&diff_format=u
Index: php-src/ext/mysqlnd/mysqlnd_portability.h
diff -u php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.8
php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.9
--- php-src/ext/mysqlnd/mysqlnd_portability.h:1.4.2.8 Thu Nov 6 10:37:47 2008
+++ php-src/ext/mysqlnd/mysqlnd_portability.h Thu Nov 6 11:29:20 2008
@@ -231,7 +231,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
