From 86fcffb3230cfe326da144db9e3009e5ab9c85ca Mon Sep 17 00:00:00 2001
From: "joerg@mysql.com" <>
Date: Mon, 30 Aug 2004 17:41:41 +0200
Subject: If the system has 64 bit "long", then "long long" does not add new
 functionality. The existing code takes advantage of this when "typedef"ing
 'longlong' in 'my_global.h'. This holds for Alpha CPUs. If the compiler then
 has prototypes for C99 functions 'strtoll()' and 'strtoull()' but no
 implementation, the existing code in 'strtoull.c' collides with that
 prototype. These collisions are avoided now. (backport from 4.1)

---
 include/m_string.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/m_string.h b/include/m_string.h
index eb2758ec506..419e70d93bf 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -238,6 +238,9 @@ extern char *str2int(const char *src,int radix,long lower,long upper,
 #ifndef HAVE_STRTOULL
 #define HAVE_STRTOULL
 #endif
+#ifndef HAVE_STRTOLL
+#define HAVE_STRTOLL
+#endif
 #else
 #ifdef HAVE_LONG_LONG
 extern char *longlong2str(longlong val,char *dst,int radix);
-- 
cgit v1.2.1