summaryrefslogtreecommitdiff
path: root/strings/strtol.c
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 /strings/strtol.c
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 'strings/strtol.c')
-rw-r--r--strings/strtol.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/strings/strtol.c b/strings/strtol.c
index 10d7f8f9da6..ed4ca86c846 100644
--- a/strings/strtol.c
+++ b/strings/strtol.c
@@ -14,9 +14,16 @@
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
-/* This defines strtol() if neaded */
+/* This implements strtol() if needed */
+/*
+ These includes are mandatory because they check for type sizes and
+ functions, especially they handle tricks for Tru64 where 'long' is
+ 64 bit already and our 'longlong' is just a 'long'.
+ */
#include <my_global.h>
+#include <m_string.h>
+
#if !defined(MSDOS) && !defined(HAVE_STRTOL) && !defined(__WIN__)
#include "strto.c"
#endif