From: Jim Meyering <jim@meyering.net>
Date: Sat, 13 Sep 2003 19:53:18 +0000 (+0000)
Subject: Update from gnulib.
X-Git-Tag: v5.1.0~618
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e149418b792bc1ea9335512c97eccfe0ff6af76;p=thirdparty%2Fcoreutils.git

Update from gnulib.
---

diff --git a/lib/xstrtol.c b/lib/xstrtol.c
index 73d87bacb2..4be09f1693 100644
--- a/lib/xstrtol.c
+++ b/lib/xstrtol.c
@@ -33,21 +33,10 @@
    need stderr defined if assertion checking is enabled.  */
 #include <stdio.h>
 
-#if STDC_HEADERS
-# include <stdlib.h>
-#endif
-
-#if HAVE_STRING_H
-# include <string.h>
-#else
-# include <strings.h>
-# ifndef strchr
-#  define strchr index
-# endif
-#endif
-
 #include <assert.h>
 #include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
 
 #include <errno.h>
 #ifndef errno
@@ -69,14 +58,6 @@ extern int errno;
 
 #include "xstrtol.h"
 
-#if !HAVE_DECL_STRTOL && !defined strtol
-long int strtol ();
-#endif
-
-#if !HAVE_DECL_STRTOUL && !defined strtoul
-unsigned long int strtoul ();
-#endif
-
 #if !HAVE_DECL_STRTOIMAX && !defined strtoimax
 intmax_t strtoimax ();
 #endif
@@ -266,7 +247,7 @@ __xstrtol (const char *s, char **ptr, int strtol_base,
 char *program_name;
 
 int
-main (int argc, char** argv)
+main (int argc, char **argv)
 {
   strtol_error s_err;
   int i;