/* 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
#if HAVE_INTTYPES_H
# include <inttypes.h>
+#elif HAVE_STDINT_H
+# include <stdint.h>
#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]; }
"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
"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
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);