From f596d1be2e5d0526a012da06240c74e22eb5d51d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 6 Sep 2001 19:47:45 +0000 Subject: [PATCH] (HAVE_LONG_LONG): Redefine to HAVE_UNSIGNED_LONG_LONG if unsigned. (strtoimax): Use sizeof (long), not sizeof strtol (ptr, endptr, base), to work around bug in IBM C compiler. --- lib/strtoimax.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/strtoimax.c b/lib/strtoimax.c index cda6b44..0f03ca1 100644 --- a/lib/strtoimax.c +++ b/lib/strtoimax.c @@ -71,6 +71,8 @@ long long strtoll PARAMS ((char const *, char **, int)); #endif #ifdef UNSIGNED +# undef HAVE_LONG_LONG +# define HAVE_LONG_LONG HAVE_UNSIGNED_LONG_LONG # define INT uintmax_t # define strtoimax strtoumax # define strtol strtoul @@ -82,16 +84,16 @@ long long strtoll PARAMS ((char const *, char **, int)); INT strtoimax (char const *ptr, char **endptr, int base) { -#if HAVE_UNSIGNED_LONG_LONG +#if HAVE_LONG_LONG verify (size_is_that_of_long_or_long_long, - (sizeof (INT) == sizeof strtol (ptr, endptr, base) - || sizeof (INT) == sizeof strtoll (ptr, endptr, base))); + (sizeof (INT) == sizeof (long) + || sizeof (INT) == sizeof (long long))); - if (sizeof (INT) != sizeof strtol (ptr, endptr, base)) + if (sizeof (INT) != sizeof (long)) return strtoll (ptr, endptr, base); #else verify (size_is_that_of_long, - sizeof (INT) == sizeof strtol (ptr, endptr, base)); + sizeof (INT) == sizeof (long)); #endif return strtol (ptr, endptr, base); -- 2.44.0