Use Autoconf-suggested pattern for inttypes and stdint.

diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index 4ce741cfdd3b948820f044d6817ef85c3e1e9982..8a67f71b92eba7e081dff36d6d239a92818dc00e 100644 (file)
--- 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);