summaryrefslogtreecommitdiff
path: root/lib/xstrtol.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2001-09-20 14:46:55 +0000
committerJim Meyering <jim@meyering.net>2001-09-20 14:46:55 +0000
commitb5fd7864101a32ed32196101cfc95f22d14a5714 (patch)
treeef23ad2201683eb0ba817a5c3174640920582bd0 /lib/xstrtol.c
parent95ce12946baa55e5c65e6344dd9afa8721ee78b4 (diff)
downloadcoreutils-b5fd7864101a32ed32196101cfc95f22d14a5714.tar.xz
(strtoimax): Guard declaration with
`#if !HAVE_DECL_STRTOIMAX', rather than just `#ifndef strtoimax'. The latter fails because some systems (at least rs6000-ibm-aix4.3.3.0) have their own, conflicting declaration of strtoimax in sys/inttypes.h. (strtoumax): Likewise, for completeness (it wasn't necessary).
Diffstat (limited to 'lib/xstrtol.c')
-rw-r--r--lib/xstrtol.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index b677ef9ff..d7ca6cf5b 100644
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -1,5 +1,5 @@
/* A more useful interface to strtol.
- Copyright (C) 1995, 1996, 1998-2000 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1998-2001 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
@@ -86,11 +86,11 @@ long int strtol ();
unsigned long int strtoul ();
#endif
-#ifndef strtoimax
+#if !HAVE_DECL_STRTOIMAX
intmax_t strtoimax ();
#endif
-#ifndef strtoumax
+#if !HAVE_DECL_STRTOUMAX
uintmax_t strtoumax ();
#endif