*** empty log message ***

[gnulib.git] / lib / xstrtol.h

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index cc8eddf..5f351a7 100644 (file)
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -1,5 +1,5 @@
-#ifndef _xstrtol_h_
-# define _xstrtol_h_ 1
+#ifndef XSTRTOL_H_
+# define XSTRTOL_H_ 1
 
 # if STRING_TO_UNSIGNED
 #  define __xstrtol xstrtoul
@@ -20,16 +20,19 @@
 #  define PARAMS(Args) ()
 # 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));
 
+#undef _STRTOL_ERROR
 # define _STRTOL_ERROR(Exit_code, Str, Argument_type_string, Err)      \
   do                                                                   \
     {                                                                  \
@@ -63,4 +66,4 @@ strtol_error
 # define STRTOL_FAIL_WARN(Str, Argument_type_string, Err)              \
   _STRTOL_ERROR (0, Str, Argument_type_string, Err)
 
-#endif /* _xstrtol_h_ */
+#endif /* not XSTRTOL_H_ */