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

5 files changed, 45 insertions, 7 deletions

diff --git a/strings/strto.c b/strings/strto.c
index 52efec6e087..9e10b935834 100644
--- a/strings/strto.c
+++ b/strings/strto.c
@@ -35,8 +35,12 @@
   it can be compiled with the UNSIGNED and/or LONGLONG flag set
 */
 
-#include <my_global.h>
-#include "m_string.h"
+
+#if !defined(_global_h) || !defined(_m_string_h)
+#  error  Calling file must include 'my_global.h' and 'm_string.h'
+   /* see 'strtoll.c' and 'strtoull.c' for the reasons */
+#endif
+
 #include "m_ctype.h"
 #include "my_sys.h"			/* defines errno */
 #include <errno.h>
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
diff --git a/strings/strtoll.c b/strings/strtoll.c
index b0b4ef328fc..45352ffd360 100644
--- a/strings/strtoll.c
+++ b/strings/strtoll.c
@@ -14,11 +14,20 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-/* This is defines strtoll() if neaded */
+/* This implements strtoll() if needed */
 
-#define strtoll glob_strtoll		/* Fix for True64 */
 
+/*
+   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'.
+   This solves a problem on Tru64 where the C99 compiler has a prototype
+   for 'strtoll()' but no implementation, see "6.1 New C99 library functions" 
+   in file '/usr/share/doclib/cc.dtk/release_notes.txt'.
+ */
 #include <my_global.h>
+#include <m_string.h>
+
 #if !defined(HAVE_STRTOLL) && defined(HAVE_LONG_LONG)
 #define USE_LONGLONG
 #include "strto.c"
diff --git a/strings/strtoul.c b/strings/strtoul.c
index 00e1f820942..32a7bc62298 100644
--- a/strings/strtoul.c
+++ b/strings/strtoul.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 is defines strtoul() 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_STRTOUL)
 #define USE_UNSIGNED
 #include "strto.c"
diff --git a/strings/strtoull.c b/strings/strtoull.c
index f4f3ce19bf7..0c2788bc188 100644
--- a/strings/strtoull.c
+++ b/strings/strtoull.c
@@ -14,9 +14,20 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-/* This is defines strtoull() */
+/* This implements strtoull() 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'.
+   This solves a problem on Tru64 where the C99 compiler has a prototype
+   for 'strtoull()' but no implementation, see "6.1 New C99 library functions" 
+   in file '/usr/share/doclib/cc.dtk/release_notes.txt'.
+ */
 #include <my_global.h>
+#include <m_string.h>
+
 #if !defined(HAVE_STRTOULL) && defined(HAVE_LONG_LONG)
 #define USE_UNSIGNED
 #define USE_LONGLONG