summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorjoerg@mysql.com <>2004-08-26 17:30:53 +0200
committerjoerg@mysql.com <>2004-08-26 17:30:53 +0200
commit10cf7f1f387227e777637d1c01fe90c735fd4bda (patch)
treec8951dd1e0a372f4564a5682b7f39f0e8a42499d /include
parent9a6b76aa90aa2392b3ae79fc5240a22064a9b890 (diff)
downloadmariadb-git-10cf7f1f387227e777637d1c01fe90c735fd4bda.tar.gz
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.
Diffstat (limited to 'include')
-rw-r--r--include/m_string.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/m_string.h b/include/m_string.h
index 0709dbaffb4..97d34421537 100644
--- a/include/m_string.h
+++ b/include/m_string.h
@@ -238,6 +238,9 @@ longlong my_strtoll10(const char *nptr, char **endptr, int *error);
#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);