X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fstrtoimax.c;h=3e12cc637a4a536f425b71c0cd23f6a901ac4e0d;hb=279342da52719ba89de13f7c8b99660695b95080;hp=cda6b44d0d875a64e85079e78e21f7a04e6cce94;hpb=9a3aebb793224b17196fc77d6cb203a41a5c1905;p=gnulib.git

diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index cda6b44d0..3e12cc637 100644
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -1,5 +1,5 @@
 /* Convert string representation of a number into an intmax_t value.
-   Copyright 1999, 2001 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003 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,20 +23,16 @@
 
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
+#else
+# if HAVE_STDINT_H
+#  include <stdint.h>
+# endif
 #endif
 
 #if HAVE_STDLIB_H
 # include <stdlib.h>
 #endif
 
-#ifndef PARAMS
-# if defined PROTOTYPES || defined __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
-# endif
-#endif
-
 /* Verify a requirement at compile-time (unlike assert, which is runtime).  */
 #define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; }
 
@@ -45,13 +41,13 @@
 "this configure-time declaration test was not run"
 # endif
 # if !HAVE_DECL_STRTOUL
-unsigned long strtoul PARAMS ((char const *, char **, int));
+unsigned long strtoul (char const *, char **, int);
 # endif
 # 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 PARAMS ((char const *, char **, int));
+unsigned long long strtoull (char const *, char **, int);
 # endif
 
 #else
@@ -60,17 +56,19 @@ unsigned long long strtoull PARAMS ((char const *, char **, int));
 "this configure-time declaration test was not run"
 # endif
 # if !HAVE_DECL_STRTOL
-long strtol PARAMS ((char const *, char **, int));
+long strtol (char const *, char **, int);
 # endif
 # ifndef HAVE_DECL_STRTOLL
 "this configure-time declaration test was not run"
 # endif
 # if !HAVE_DECL_STRTOLL && HAVE_UNSIGNED_LONG_LONG
-long long strtoll PARAMS ((char const *, char **, int));
+long long 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 strtoimax strtoumax
 # define strtol strtoul
@@ -82,16 +80,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);