projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
maint: make Include sections of modules consistent
[gnulib.git]
/
lib
/
strtoimax.c
diff --git
a/lib/strtoimax.c
b/lib/strtoimax.c
index
098cfa9
..
ab9bcff
100644
(file)
--- a/
lib/strtoimax.c
+++ b/
lib/strtoimax.c
@@
-1,12
+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 (C) 1999, 2001, 2002, 2003, 2004 Free Software
+ Copyright (C) 1999, 2001, 2002, 2003, 2004
, 2006
Free Software
Foundation, Inc.
Foundation, Inc.
- This program is free software
;
you can redistribute it and/or modify
+ 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
@@
-14,14
+14,11
@@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Paul Eggert. */
/* Written by Paul Eggert. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Verify interface. */
#include <inttypes.h>
/* Verify interface. */
#include <inttypes.h>
@@
-34,8
+31,8
@@
# 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 (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
@@
-43,33
+40,35
@@
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
-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
# 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 H
AVE_LONG_LONG
- verify (sizeof (I
NT) == sizeof (
long int)
- || sizeof (I
NT) == sizeof (
long long int));
+#if H
ave_long_long
+ verify (sizeof (I
nt) == sizeof (Unsigned
long int)
+ || sizeof (I
nt) == sizeof (Unsigned
long long int));
- if (sizeof (I
NT) != sizeof (
long int))
+ if (sizeof (I
nt) != sizeof (Unsigned
long int))
return strtoll (ptr, endptr, base);
#else
return strtoll (ptr, endptr, base);
#else
- verify (sizeof (I
NT) == sizeof (
long int));
+ verify (sizeof (I
nt) == sizeof (Unsigned
long int));
#endif
return strtol (ptr, endptr, base);
#endif
return strtol (ptr, endptr, base);