diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2013-10-08 23:27:49 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-10-08 23:28:13 -0700 |
commit | 249e955142d9ceaaeba6240bbaaf618487008915 (patch) | |
tree | e69e5c5a9af08e1ede5c6cea62b9ab00e93f9e61 | |
parent | 0a47086e94a3077e6f49a6df8cd0a03e0ac88b56 (diff) | |
download | gnulib-249e955142d9ceaaeba6240bbaaf618487008915.tar.gz |
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.
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | lib/strtoimax.c | 15 |
2 files changed, 17 insertions, 6 deletions
@@ -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 --git a/lib/strtoimax.c b/lib/strtoimax.c index c9bd2ad3b1..b4feaf361f 100644 --- 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 +# 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); } |