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

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index ff44d6bec..7a9a02445 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,64 +1,64 @@
-#ifndef _xstrtol_h_
-#define _xstrtol_h_ 1
+#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
-#endif
+# if HAVE_INTTYPES_H
+#  include <inttypes.h> /* for uintmax_t */
+# endif
 
-#if defined (__STDC__) && __STDC__
-#define	__P(x) x
-#else
-#define	__P(x) ()
-#endif
+# ifndef PARAMS
+#  if defined PROTOTYPES || (defined __STDC__ && __STDC__)
+#   define PARAMS(Args) Args
+#  else
+#   define PARAMS(Args) ()
+#  endif
+# endif
 
+# ifndef _STRTOL_ERROR
 enum strtol_error
   {
     LONGINT_OK, LONGINT_INVALID, LONGINT_INVALID_SUFFIX_CHAR, LONGINT_OVERFLOW
   };
 typedef enum strtol_error strtol_error;
+# endif
 
-strtol_error
-  __xstrtol __P ((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)
 
-#define _STRTOL_ERROR(exit_code, str, argument_type_string, err)	\
+# define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err)	\
   do									\
     {									\
-      switch ((err))							\
+      switch ((Err))							\
 	{								\
 	case LONGINT_OK:						\
 	  abort ();							\
 									\
 	case LONGINT_INVALID:						\
-	  error ((exit_code), 0, "invalid %s `%s'",			\
-		 (argument_type_string), (str));			\
+	  error ((Exit_code), 0, "invalid %s `%s'",			\
+		 (Argument_type_string), (Str));			\
 	  break;							\
 									\
 	case LONGINT_INVALID_SUFFIX_CHAR:				\
-	  error ((exit_code), 0, "invalid character following %s `%s'",	\
-		 (argument_type_string), (str));			\
+	  error ((Exit_code), 0, "invalid character following %s `%s'",	\
+		 (Argument_type_string), (Str));			\
 	  break;							\
 									\
 	case LONGINT_OVERFLOW:						\
-	  error ((exit_code), 0, "%s `%s' larger than maximum long int",\
-		 (argument_type_string), (str));			\
+	  error ((Exit_code), 0, "%s `%s' too large",			\
+		 (Argument_type_string), (Str));			\
 	  break;							\
 	}								\
     }									\
   while (0)
 
-#define STRTOL_FATAL_ERROR(str, argument_type_string, err)		\
-  _STRTOL_ERROR (2, str, argument_type_string, err)
+# define STRTOL_FATAL_ERROR(Str, Argument_type_string, Err)		\
+  _STRTOL_ERROR (2, Str, Argument_type_string, Err)
 
-#define STRTOL_FAIL_WARN(str, argument_type_string, err)		\
-  _STRTOL_ERROR (0, str, argument_type_string, err)
+# define STRTOL_FAIL_WARN(Str, Argument_type_string, Err)		\
+  _STRTOL_ERROR (0, Str, Argument_type_string, Err)
 
-#endif /* _xstrtol_h_ */
+#endif /* not XSTRTOL_H_ */