Started merging with cpio into paxutils.

[chaz/tar] / lib / xstrtol.c

diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index d7ca6cf5bee9fb4773030bbe78d9f918d318075f..88071cdc53b3403aa473c053e3f8d4932997130d 100644 (file)
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -78,19 +78,19 @@ extern int errno;
 
 #include "xstrtol.h"
 
-#ifndef strtol
+#if !HAVE_DECL_STRTOL && !defined strtol
 long int strtol ();
 #endif
 
-#ifndef strtoul
+#if !HAVE_DECL_STRTOUL && !defined strtoul
 unsigned long int strtoul ();
 #endif
 
-#if !HAVE_DECL_STRTOIMAX
+#if !HAVE_DECL_STRTOIMAX && !defined strtoimax
 intmax_t strtoimax ();
 #endif
 
-#if !HAVE_DECL_STRTOUMAX
+#if !HAVE_DECL_STRTOUMAX && !defined strtoumax
 uintmax_t strtoumax ();
 #endif