From: Andi Gutmans <andi@php.net>
Date: Sun, 7 Apr 2002 20:49:10 +0000 (+0000)
Subject: - Fix build with Visual Studio .NET. The MySQL team said they'll commit
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~809
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35befd3eb32bf4fdba7dc0350727b0e77392a7c2;p=php

- 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 144ad2f883..0e1af5d2e7 100644
--- 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 4dde6e4e87..6acb8ff84d 100644
--- 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 807449e0af..8ab99fb0c2 100644
--- 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