X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrtoimax.c;h=a1fd3b1520563503d32b35f2422c54325fb86976;hb=709c1f1fb17a388b106f6305a952da3ba802218e;hp=4ce741cfdd3b948820f044d6817ef85c3e1e9982;hpb=fa9635f22ac175bace582885ca780d3eb511b578;p=gnulib.git

diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index 4ce741cfd..a1fd3b152 100644
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -1,5 +1,7 @@
 /* Convert string representation of a number into an intmax_t value.
-   Copyright (C) 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+
+   Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software
+   Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,7 +25,8 @@
 
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
-#elif HAVE_STDINT_H
+#endif
+#if HAVE_STDINT_H
 # include <stdint.h>
 #endif
 
@@ -66,14 +69,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);