- Fix build with Visual Studio .NET. The MySQL team said they'll commit

- their fix a long time ago and never did. One day they'll update the
- whole MySQL client library.

diff --git a/ext/mysql/libmysql/strto.c b/ext/mysql/libmysql/strto.c
index 144ad2f883c5973494331f6ed0ebd519ea4e2c38..0e1af5d2e704db85b5876c0e888e83e8cf1d4e3a 100644 (file)
--- a/ext/mysql/libmysql/strto.c
+++ b/ext/mysql/libmysql/strto.c
@@ -28,7 +28,7 @@ This file is public domain and comes with NO WARRANTY of any kind */
 #include "my_sys.h"                    /* defines errno */
 #include <errno.h>
 
-#ifdef LONGLONG
+#ifdef MYSQL_LONGLONG
 #define UTYPE_MAX (~(ulonglong) 0)
 #define TYPE_MIN LONGLONG_MIN
 #define TYPE_MAX LONGLONG_MAX

diff --git a/ext/mysql/libmysql/strtoll.c b/ext/mysql/libmysql/strtoll.c
index 4dde6e4e8770e35e976b329fb1800f94cc2102a6..6acb8ff84d97b213d4dd61862619736702217b7f 100644 (file)
--- a/ext/mysql/libmysql/strtoll.c
+++ b/ext/mysql/libmysql/strtoll.c
@@ -6,6 +6,6 @@ This file is public domain and comes with NO WARRANTY of any kind */
 #include <global.h>
 #include <m_string.h>
 #if !defined(HAVE_STRTOULL) && defined(HAVE_LONG_LONG)
-#define LONGLONG
+#define MYSQL_LONGLONG
 #include "strto.c"
 #endif

diff --git a/ext/mysql/libmysql/strtoull.c b/ext/mysql/libmysql/strtoull.c
index 807449e0aff90d9e1d9b9e212866b2477105ee43..8ab99fb0c2b8d61bbb07f2252e6b9f32e28c514b 100644 (file)
--- a/ext/mysql/libmysql/strtoull.c
+++ b/ext/mysql/libmysql/strtoull.c
@@ -7,6 +7,6 @@ This file is public domain and comes with NO WARRANTY of any kind */
 #include <m_string.h>
 #if !defined(HAVE_STRTOULL) && defined(HAVE_LONG_LONG)
 #define UNSIGNED
-#define LONGLONG
+#define MYSQL_LONGLONG
 #include "strto.c"
 #endif