projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
assert-h: work around 'verify' incompatibility
[pspp]
/
lib
/
strtoimax.c
diff --git
a/lib/strtoimax.c
b/lib/strtoimax.c
index 0f03ca174b7826ab70ac80634d648433d9a89183..497d15585ced3f20912e9e1a579646f2027c012d 100644
(file)
--- a/
lib/strtoimax.c
+++ b/
lib/strtoimax.c
@@
-1,10
+1,12
@@
/* Convert string representation of a number into an intmax_t value.
/* Convert string representation of a number into an intmax_t value.
- Copyright 1999, 2001 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1999, 2001-2004, 2006, 2009-2011 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
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-12,88
+14,61
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* 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
+/* Verify interface. */
+#include <inttypes.h>
-#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
+#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
#ifdef UNSIGNED
-# ifndef HAVE_DECL_STRTOUL
-"this configure-time declaration test was not run"
-# endif
-# if !HAVE_DECL_STRTOUL
-unsigned long strtoul PARAMS ((char const *, char **, int));
-# endif
# ifndef HAVE_DECL_STRTOULL
"this configure-time declaration test was not run"
# 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)
);
+# if !HAVE_DECL_STRTOULL && HAVE_UNSIGNED_LONG_LONG
_INT
+unsigned long long
int strtoull (char const *, char **, int
);
# endif
#else
# endif
#else
-# ifndef HAVE_DECL_STRTOL
-"this configure-time declaration test was not run"
-# endif
-# if !HAVE_DECL_STRTOL
-long strtol PARAMS ((char const *, char **, int));
-# endif
# 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
-long long
strtoll PARAMS ((char const *, char **, int)
);
+# if !HAVE_DECL_STRTOLL && HAVE_
LONG_LONG_INT
+long long
int strtoll (char const *, char **, int
);
# endif
#endif
#ifdef UNSIGNED
# 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 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
#endif
-I
NT
+I
nt
strtoimax (char const *ptr, char **endptr, int base)
{
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)));
+#if Have_long_long
+ verify (sizeof (Int) == sizeof (Unsigned long int)
+ || sizeof (Int) == sizeof (Unsigned long long int));
- if (sizeof (I
NT) != sizeof (long
))
+ if (sizeof (I
nt) != sizeof (Unsigned long int
))
return strtoll (ptr, endptr, base);
#else
return strtoll (ptr, endptr, base);
#else
- verify (size_is_that_of_long,
- sizeof (INT) == sizeof (long));
+ verify (sizeof (Int) == sizeof (Unsigned long int));
#endif
return strtol (ptr, endptr, base);
#endif
return strtol (ptr, endptr, base);