projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* lib/regex_internal.c (re_string_reconstruct): Handle
[gnulib.git]
/
lib
/
strtoimax.c
diff --git
a/lib/strtoimax.c
b/lib/strtoimax.c
index
a1fd3b1
..
f1828b1
100644
(file)
--- a/
lib/strtoimax.c
+++ b/
lib/strtoimax.c
@@
-1,6
+1,6
@@
/* Convert string representation of a number into an intmax_t value.
/* 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
Foundation, Inc.
This program is free software; you can redistribute it and/or modify
@@
-15,31
+15,24
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
- Inc., 5
9 Temple Place - Suite 330, Boston, MA 02111-1307
, USA. */
+ Inc., 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301
, USA. */
/* Written by Paul Eggert. */
/* Written by Paul Eggert. */
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#if HAVE_STDINT_H
-# include <stdint.h>
-#endif
+/* Verify interface. */
+#include <inttypes.h>
#include <stdlib.h>
#include <stdlib.h>
-/* Verify a requirement at compile-time (unlike assert, which is runtime). */
-#define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; }
+#include "verify.h"
#ifdef UNSIGNED
# ifndef HAVE_DECL_STRTOULL
"this configure-time declaration test was not run"
# endif
#ifdef UNSIGNED
# ifndef HAVE_DECL_STRTOULL
"this configure-time declaration test was not run"
# endif
-# if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG
+# if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG
_INT
unsigned long long strtoull (char const *, char **, int);
# endif
unsigned long long strtoull (char const *, char **, int);
# endif
@@
-48,14
+41,14
@@
unsigned long long strtoull (char const *, char **, int);
# ifndef HAVE_DECL_STRTOLL
"this configure-time declaration test was not run"
# endif
# ifndef HAVE_DECL_STRTOLL
"this configure-time declaration test was not run"
# endif
-# if !HAVE_DECL_STRTOLL && HAVE_UNSIGNED_LONG_LONG
+# if !HAVE_DECL_STRTOLL && HAVE_UNSIGNED_LONG_LONG
_INT
long long strtoll (char const *, char **, int);
# endif
#endif
#ifdef UNSIGNED
long long strtoll (char const *, char **, int);
# endif
#endif
#ifdef UNSIGNED
-# undef HAVE_LONG_LONG
-# define HAVE_LONG_LONG
HAVE_UNSIGNED_LONG_LONG
+# undef HAVE_LONG_LONG
_INT
+# define HAVE_LONG_LONG
_INT HAVE_UNSIGNED_LONG_LONG_INT
# define INT uintmax_t
# define strtoimax strtoumax
# define strtol strtoul
# define INT uintmax_t
# define strtoimax strtoumax
# define strtol strtoul
@@
-67,16
+60,14
@@
long long strtoll (char const *, char **, int);
INT
strtoimax (char const *ptr, char **endptr, int base)
{
INT
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 int)
- || sizeof (INT) == sizeof (long long int)));
+#if HAVE_LONG_LONG_INT
+ verify (sizeof (INT) == sizeof (long int)
+ || sizeof (INT) == sizeof (long long int));
if (sizeof (INT) != sizeof (long int))
return strtoll (ptr, endptr, base);
#else
if (sizeof (INT) != sizeof (long int))
return strtoll (ptr, endptr, base);
#else
- verify (size_is_that_of_long,
- sizeof (INT) == sizeof (long int));
+ verify (sizeof (INT) == sizeof (long int));
#endif
return strtol (ptr, endptr, base);
#endif
return strtol (ptr, endptr, base);