X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrtoimax.c;h=82dc4f0d75fbef355d391905ac86cb94845f42f0;hb=c6ad67bb80efa455e52904f98af0c8c4ec4f36ee;hp=098cfa966e71f71d6873d5d6c1ccb3d8c15c35cc;hpb=d58cf1a8bfe32f0a726fd4e22d275bf6b6f760e1;p=gnulib.git

diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index 098cfa966..82dc4f0d7 100644
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -1,6 +1,6 @@
 /* Convert string representation of a number into an intmax_t value.
 
-   Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2006 Free Software
    Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,7 @@
 
 /* Written by Paul Eggert. */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 /* Verify interface.  */
 #include <inttypes.h>
@@ -34,8 +32,8 @@
 # ifndef HAVE_DECL_STRTOULL
 "this configure-time declaration test was not run"
 # endif
-# if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG
-unsigned long long strtoull (char const *, char **, int);
+# if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG_INT
+unsigned long long int strtoull (char const *, char **, int);
 # endif
 
 #else
@@ -43,33 +41,35 @@ unsigned long long strtoull (char const *, char **, int);
 # ifndef HAVE_DECL_STRTOLL
 "this configure-time declaration test was not run"
 # endif
-# if !HAVE_DECL_STRTOLL && HAVE_UNSIGNED_LONG_LONG
-long long strtoll (char const *, char **, int);
+# if !HAVE_DECL_STRTOLL && HAVE_LONG_LONG_INT
+long long int strtoll (char const *, char **, int);
 # endif
 #endif
 
 #ifdef UNSIGNED
-# undef HAVE_LONG_LONG
-# define HAVE_LONG_LONG HAVE_UNSIGNED_LONG_LONG
-# define INT uintmax_t
+# define Have_long_long HAVE_UNSIGNED_LONG_LONG_INT
+# define Int uintmax_t
+# define Unsigned unsigned
 # define strtoimax strtoumax
 # define strtol strtoul
 # define strtoll strtoull
 #else
-# define INT intmax_t
+# define Have_long_long HAVE_LONG_LONG_INT
+# define Int intmax_t
+# define Unsigned
 #endif
 
-INT
+Int
 strtoimax (char const *ptr, char **endptr, int base)
 {
-#if HAVE_LONG_LONG
-  verify (sizeof (INT) == sizeof (long int)
-	  || sizeof (INT) == sizeof (long long int));
+#if Have_long_long
+  verify (sizeof (Int) == sizeof (Unsigned long int)
+	  || sizeof (Int) == sizeof (Unsigned long long int));
 
-  if (sizeof (INT) != sizeof (long int))
+  if (sizeof (Int) != sizeof (Unsigned long int))
     return strtoll (ptr, endptr, base);
 #else
-  verify (sizeof (INT) == sizeof (long int));
+  verify (sizeof (Int) == sizeof (Unsigned long int));
 #endif
 
   return strtol (ptr, endptr, base);