From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 20 Sep 2001 18:01:31 +0000 (+0000)
Subject: From Jim Meyering.
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=1589ca47d0448f87b9a492bf5a527e53f7f1cc77;p=chaz%2Ftar

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).
---

diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index b677ef9..d7ca6cf 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