projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[gnulib.git]
/
lib
/
strtoimax.c
diff --git
a/lib/strtoimax.c
b/lib/strtoimax.c
index
cda6b44
..
0f03ca1
100644
(file)
--- a/
lib/strtoimax.c
+++ b/
lib/strtoimax.c
@@
-71,6
+71,8
@@
long long strtoll PARAMS ((char const *, char **, int));
#endif
#ifdef UNSIGNED
#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
# define INT uintmax_t
# define strtoimax strtoumax
# define strtol strtoul
@@
-82,16
+84,16
@@
long long strtoll PARAMS ((char const *, char **, int));
INT
strtoimax (char const *ptr, char **endptr, int base)
{
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,
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,
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);
#endif
return strtol (ptr, endptr, base);