X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.h;h=5715134c8e0345ceeb3115c7a9476f5eb0862fc3;hb=e9721c2f5a8ea905fba888055ca0fd0767f8873d;hp=baea032db0ec32bde0f58d6a4cff79fb67a62c21;hpb=5b08577168f0343751bcec977335dac4eaa45949;p=gnulib.git

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index baea032db..5715134c8 100644
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,36 +1,38 @@
-#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 STRING_TO_UNSIGNED
+#  define __xstrtol xstrtoul
+#  define __strtol strtoul
+#  define __unsigned unsigned
+# else
+#  define __xstrtol xstrtol
+#  define __strtol strtol
+#  define __unsigned /* empty */
+# endif
 
-#undef PARAMS
-#if defined (__STDC__) && __STDC__
-# define PARAMS(Args) Args
-#else
-# define PARAMS(Args) ()
-#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 PARAMS ((const char *s, char **ptr, int base,
 		     __unsigned long int *val, const char *valid_suffixes));
 
-#define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err)	\
+# undef _STRTOL_ERROR
+# define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err)	\
   do									\
     {									\
       switch ((Err))							\
@@ -57,10 +59,10 @@ strtol_error
     }									\
   while (0)
 
-#define STRTOL_FATAL_ERROR(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)		\
+# define STRTOL_FAIL_WARN(Str, Argument_type_string, Err)		\
   _STRTOL_ERROR (0, Str, Argument_type_string, Err)
 
-#endif /* _xstrtol_h_ */
+#endif /* not XSTRTOL_H_ */