strtoimax: port to HP-UX 11.11

Problem reported by Daniel Richard G.
* lib/strtoimax.c (Strtoimax, Strtol, Strtoll): New macros.
(strtoimax, strtol, strtoll) [UNSIGNED]: Remove, since
they might clash with inttypes.h.

diff --git a/ChangeLog b/ChangeLog
index 01dca10..1d3cb6c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-10-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+       strtoimax: port to HP-UX 11.11
+       Problem reported by Daniel Richard G.
+       * lib/strtoimax.c (Strtoimax, Strtol, Strtoll): New macros.
+       (strtoimax, strtol, strtoll) [UNSIGNED]: Remove, since
+       they might clash with inttypes.h.
+

 2013-10-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        New module 'count-trailing-zeros'.
 2013-10-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        New module 'count-trailing-zeros'.

diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index c9bd2ad..b4feaf3 100644 (file)
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -48,28 +48,31 @@ long long int strtoll (char const *, char **, int);
 #ifdef UNSIGNED
 # define Have_long_long HAVE_UNSIGNED_LONG_LONG_INT
 # define Int uintmax_t
 #ifdef UNSIGNED
 # define Have_long_long HAVE_UNSIGNED_LONG_LONG_INT
 # define Int uintmax_t

+# define Strtoimax strtoumax
+# define Strtol strtoul
+# define Strtoll strtoull

 # define Unsigned unsigned
 # define Unsigned unsigned

-# define strtoimax strtoumax
-# define strtol strtoul
-# define strtoll strtoull

 #else
 # define Have_long_long HAVE_LONG_LONG_INT
 # define Int intmax_t
 #else
 # define Have_long_long HAVE_LONG_LONG_INT
 # define Int intmax_t

+# define Strtoimax strtoimax
+# define Strtol strtol
+# define Strtoll strtoll

 # define Unsigned
 #endif
 
 Int
 # define Unsigned
 #endif
 
 Int

-strtoimax (char const *ptr, char **endptr, int base)
+Strtoimax (char const *ptr, char **endptr, int base)

 {
 #if Have_long_long
   verify (sizeof (Int) == sizeof (Unsigned long int)
           || sizeof (Int) == sizeof (Unsigned long long int));
 
   if (sizeof (Int) != sizeof (Unsigned long int))
 {
 #if Have_long_long
   verify (sizeof (Int) == sizeof (Unsigned long int)
           || sizeof (Int) == sizeof (Unsigned long long int));
 
   if (sizeof (Int) != sizeof (Unsigned long int))

-    return strtoll (ptr, endptr, base);
+    return Strtoll (ptr, endptr, base);

 #else
   verify (sizeof (Int) == sizeof (Unsigned long int));
 #endif
 
 #else
   verify (sizeof (Int) == sizeof (Unsigned long int));
 #endif
 

-  return strtol (ptr, endptr, base);
+  return Strtol (ptr, endptr, base);

 }
 }