From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 2 Aug 2004 22:50:29 +0000 (+0000)
Subject: Use Autoconf-suggested pattern for inttypes and stdint.
X-Git-Tag: v5.3.0~924
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c04045506d5d305bcf7c507d8995f5d4b5a92737;p=thirdparty%2Fcoreutils.git

Use Autoconf-suggested pattern for inttypes and stdint.
---

diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index 4ce741cfdd..8a67f71b92 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);