Ensure we use gnulib mktime rather than glibc's mktime, on hosts

[gnulib.git] / lib / xstrtol.h

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 3c16c7e..a1ad32d 100644 (file)
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,16 +1,30 @@
+/* A more useful interface to strtol.
+   Copyright 1995, 1996, 1998, 1999, 2001, 2002 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
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
 #ifndef XSTRTOL_H_
 # define XSTRTOL_H_ 1
 
-# if STRING_TO_UNSIGNED
-#  define __xstrtol xstrtoul
-#  define __strtol strtoul
-#  define __unsigned unsigned
-#  define __ZLONG_MAX ULONG_MAX
+/* Get uintmax_t.  */
+# if HAVE_INTTYPES_H
+#  include <inttypes.h>
 # else
-#  define __xstrtol xstrtol
-#  define __strtol strtol
-#  define __unsigned /* empty */
-#  define __ZLONG_MAX LONG_MAX
+#  if HAVE_STDINT_H
+#   include <stdint.h>
+#  endif
 # endif
 
 # ifndef PARAMS
@@ -29,11 +43,15 @@ enum strtol_error
 typedef enum strtol_error strtol_error;
 # endif
 
-strtol_error
-  __xstrtol PARAMS ((const char *s, char **ptr, int base,
-                    __unsigned long int *val, const char *valid_suffixes));
+# define _DECLARE_XSTRTOL(name, type) \
+  strtol_error \
+    name PARAMS ((const char *s, char **ptr, int base, \
+                 type *val, const char *valid_suffixes));
+_DECLARE_XSTRTOL (xstrtol, long int)
+_DECLARE_XSTRTOL (xstrtoul, unsigned long int)
+_DECLARE_XSTRTOL (xstrtoimax, intmax_t)
+_DECLARE_XSTRTOL (xstrtoumax, uintmax_t)
 
-# undef _STRTOL_ERROR
 # define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err)      \
   do                                                                   \
     {                                                                  \
@@ -48,13 +66,12 @@ strtol_error
          break;                                                        \
                                                                        \
        case LONGINT_INVALID_SUFFIX_CHAR:                               \
-         error ((Exit_code), 0, "invalid character following %s `%s'", \
+         error ((Exit_code), 0, "invalid character following %s in `%s'", \
                 (Argument_type_string), (Str));                        \
          break;                                                        \
                                                                        \
        case LONGINT_OVERFLOW:                                          \
-         /* FIXME: make this message dependent on STRING_TO_UNSIGNED */\
-         error ((Exit_code), 0, "%s `%s' larger than maximum long int",\
+         error ((Exit_code), 0, "%s `%s' too large",                   \
                 (Argument_type_string), (Str));                        \
          break;                                                        \
        }                                                               \