diff options
| author | Jim Meyering <jim@meyering.net> | 2003-09-13 19:53:18 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2003-09-13 19:53:18 +0000 |
| commit | 6e149418b792bc1ea9335512c97eccfe0ff6af76 (patch) | |
| tree | 4b919b54918b94f15daa3afa5ccfb07c909cb73a | |
| parent | 38c61c8bcb1348c7e32c61a2fe7379d1d2573c09 (diff) | |
| download | coreutils-6e149418b792bc1ea9335512c97eccfe0ff6af76.tar.xz | |
Update from gnulib.
| -rw-r--r-- | lib/xstrtol.c | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/lib/xstrtol.c b/lib/xstrtol.c index 73d87bacb..4be09f169 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; |