diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2001-09-20 18:01:31 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2001-09-20 18:01:31 +0000 |
| commit | 1589ca47d0448f87b9a492bf5a527e53f7f1cc77 (patch) | |
| tree | 568c8bd69e19fcb0ad7482b37cc3b0aa26919bc1 | |
| parent | e9da8d1a8020ad4dfe92416f3c77a33e6906b55e (diff) | |
| download | tar-1589ca47d0448f87b9a492bf5a527e53f7f1cc77.tar.gz | |
From Jim Meyering.
(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).
| -rw-r--r-- | lib/xstrtol.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/xstrtol.c b/lib/xstrtol.c index b677ef9f..d7ca6cf5 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 |