projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced with <unistd.h>.
[gnulib.git]
/
lib
/
strtoimax.c
diff --git
a/lib/strtoimax.c
b/lib/strtoimax.c
index
a15b84a
..
82dc4f0
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
@@
-19,16
+19,10
@@
/* Written by Paul Eggert. */
/* Written by Paul Eggert. */
-#ifdef 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>
@@
-38,8
+32,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
@@
-47,33
+41,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);