X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrtoimax.c;h=0f03ca174b7826ab70ac80634d648433d9a89183;hb=8b8ff236fe4bd09b2cdbd5d26909a008d342a695;hp=cda6b44d0d875a64e85079e78e21f7a04e6cce94;hpb=9a3aebb793224b17196fc77d6cb203a41a5c1905;p=gnulib.git

diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index cda6b44d0..0f03ca174 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);