diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2004-08-02 22:50:29 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2004-08-02 22:50:29 +0000 |
| commit | c04045506d5d305bcf7c507d8995f5d4b5a92737 (patch) | |
| tree | 212468a4a4532fbea7e863c669b9d7ce3efa670e /lib/strtoimax.c | |
| parent | 75d42c8224cb187b52f71213540ddbf20ee1d0d3 (diff) | |
| download | coreutils-c04045506d5d305bcf7c507d8995f5d4b5a92737.tar.xz | |
Use Autoconf-suggested pattern for inttypes and stdint.
Diffstat (limited to 'lib/strtoimax.c')
| -rw-r--r-- | lib/strtoimax.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/strtoimax.c b/lib/strtoimax.c index 4ce741cfd..8a67f71b9 100644 --- a/lib/strtoimax.c +++ b/lib/strtoimax.c @@ -23,7 +23,8 @@ #if HAVE_INTTYPES_H # include <inttypes.h> -#elif HAVE_STDINT_H +#endif +#if HAVE_STDINT_H # include <stdint.h> #endif @@ -66,14 +67,14 @@ strtoimax (char const *ptr, char **endptr, int base) { #if HAVE_LONG_LONG verify (size_is_that_of_long_or_long_long, - (sizeof (INT) == sizeof (long) - || sizeof (INT) == sizeof (long long))); + (sizeof (INT) == sizeof (long int) + || sizeof (INT) == sizeof (long long int))); - if (sizeof (INT) != sizeof (long)) + if (sizeof (INT) != sizeof (long int)) return strtoll (ptr, endptr, base); #else verify (size_is_that_of_long, - sizeof (INT) == sizeof (long)); + sizeof (INT) == sizeof (long int)); #endif return strtol (ptr, endptr, base); |