Import upstream version 1.26

[debian/tar] / gnu / xstrtol.h

diff --git a/gnu/xstrtol.h b/gnu/xstrtol.h
index 98d566ca7ca4898ba1769a27514cbfd3e4525e66..dbd2d453a8f4e44f406e57df90811e54b84f3894 100644 (file)
--- a/gnu/xstrtol.h
+++ b/gnu/xstrtol.h
@@ -2,7 +2,7 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* A more useful interface to strtol.
 
-   Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2010 Free Software
+   Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2011 Free Software
    Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
@@ -53,14 +53,10 @@ _DECLARE_XSTRTOL (xstrtoll, long long int)
 _DECLARE_XSTRTOL (xstrtoull, unsigned long long int)
 #endif
 
-#ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
-#  define __attribute__(x)
-# endif
-#endif
-
-#ifndef ATTRIBUTE_NORETURN
-# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
+# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__))
+#else
+# define _GL_ATTRIBUTE_NORETURN /* empty */
 #endif
 
 /* Report an error for an invalid integer in an option argument.
@@ -80,6 +76,6 @@ _DECLARE_XSTRTOL (xstrtoull, unsigned long long int)
 
 void xstrtol_fatal (enum strtol_error,
                     int, char, struct option const *,
-                    char const *) ATTRIBUTE_NORETURN;
+                    char const *) _GL_ATTRIBUTE_NORETURN;
 
 #endif /* not XSTRTOL_H_ */