X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.h;h=7a9a024457f5c40a56d689c074eebd6d994dc66f;hb=fb769ae17bd0a97d0221b3564b532941ea632772;hp=5f351a7ba7ed01700da8529fa6276443c70f12f3;hpb=8452d7e082cc23bf11cb997e4385ecb853e1ac07;p=gnulib.git

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 5f351a7ba..7a9a02445 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,38 +1,34 @@
 #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
-# else
-#  define __xstrtol xstrtol
-#  define __strtol strtol
-#  define __unsigned /* empty */
-#  define __ZLONG_MAX LONG_MAX
+# if HAVE_INTTYPES_H
+#  include <inttypes.h> /* for uintmax_t */
 # endif
 
-# undef PARAMS
-# if defined (__STDC__) && __STDC__
-#  define PARAMS(Args) Args
-# else
-#  define PARAMS(Args) ()
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
 # endif
 
-#ifndef _STRTOL_ERROR
+# ifndef _STRTOL_ERROR
 enum strtol_error
   {
     LONGINT_OK, LONGINT_INVALID, LONGINT_INVALID_SUFFIX_CHAR, LONGINT_OVERFLOW
   };
 typedef enum strtol_error strtol_error;
-#endif
+# 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 (xstrtoumax, uintmax_t)
 
-#undef _STRTOL_ERROR
 # define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err)	\
   do									\
     {									\
@@ -52,8 +48,7 @@ strtol_error
 	  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;							\
 	}								\