# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1381300069 25200
# Node ID b1fa625880595aaa8ca09cee14fea3b6eeb0baa2
# Parent  fe8f1c53b62be463ea13a517c70729fec76557a3
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 -r fe8f1c53b62b -r b1fa62588059 ChangeLog
--- a/ChangeLog	Sun Oct 06 23:58:00 2013 -0700
+++ b/ChangeLog	Tue Oct 08 23:27:49 2013 -0700
@@ -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'.
diff -r fe8f1c53b62b -r b1fa62588059 lib/strtoimax.c
--- a/lib/strtoimax.c	Sun Oct 06 23:58:00 2013 -0700
+++ b/lib/strtoimax.c	Tue Oct 08 23:27:49 2013 -0700
@@ -48,28 +48,31 @@
 #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 strtoimax strtoumax
-# define strtol strtoul
-# define strtoll strtoull
 #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
-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))
-    return strtoll (ptr, endptr, base);
+    return Strtoll (ptr, endptr, base);
 #else
   verify (sizeof (Int) == sizeof (Unsigned long int));
 #endif
 
-  return strtol (ptr, endptr, base);
+  return Strtol (ptr, endptr, base);
 }