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.


include/m_string.h:
  Extend the "fake" approach from 'strtoull()' onto 'strtoll()'.
strings/strto.c:
  Ensure that calling file has included necessary headers,
  as these are needed at the upper level already.
strings/strtol.c:
  Cleanup/alignment with the "long long" functions.
strings/strtoll.c:
  When "long" is 64 bit already, system function 'strtol()' can be used.
  Header files 'my_global.h' and 'm_string.h' will manage that,
  if they are included early enough.
strings/strtoul.c:
  Cleanup/alignment with the "long long" functions.
strings/strtoull.c:
  When "long" is 64 bit already, system function 'strtoul()' can be used.
  Header files 'my_global.h' and 'm_string.h' will manage that,
  if they are included early enough.
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

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);