Mercurial > hg > octave-shane > gnulib-hg
changeset 17517:983bff2dee91
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.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Tue, 08 Oct 2013 23:27:49 -0700 |
| parents | 97a395d4f592 |
| children | d4beb8189862 |
| files | ChangeLog lib/strtoimax.c |
| diffstat | 2 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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'.
--- a/lib/strtoimax.c +++ b/lib/strtoimax.c @@ -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); }