xstrtol: use stdnoreturn.h

* lib/xstrtol.h: Include <stdnoreturn.h>.
(_GL_ATTRIBUTE_NORETURN): Remove; all uses replaced with noreturn.
* modules/xstrtol (Depends-on): Add stdnoreturn.

diff --git a/ChangeLog b/ChangeLog
index d8bbfd38512a4a3da2be35ed886f79dd5d173a2b..0265180684fbaa4f9b57b68f10b56777916d22f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2011-07-12  Paul Eggert  <eggert@cs.ucla.edu>
 
+       xstrtol: use stdnoreturn.h
+       * lib/xstrtol.h: Include <stdnoreturn.h>.
+       (_GL_ATTRIBUTE_NORETURN): Remove; all uses replaced with noreturn.
+       * modules/xstrtol (Depends-on): Add stdnoreturn.
+
        xmemdup0: use stdnoreturn.h
        * lib/xmemdup0.h: Include <stdnoreturn.h>.
        (_GL_ATTRIBUTE_NORETURN): Remove; all uses replaced with noreturn.

diff --git a/lib/xstrtol.h b/lib/xstrtol.h
index 716a94ff9470f6c1af3e8bd2481e61820ab9e8f8..171c3efbef7c851c6dcb5cea89fd0552ba762614 100644 (file)
--- a/lib/xstrtol.h
+++ b/lib/xstrtol.h
@@ -21,6 +21,7 @@
 
 # include <getopt.h>
 # include <inttypes.h>
+# include <stdnoreturn.h>
 
 # ifndef _STRTOL_ERROR
 enum strtol_error
@@ -51,12 +52,6 @@ _DECLARE_XSTRTOL (xstrtoll, long long int)
 _DECLARE_XSTRTOL (xstrtoull, unsigned long long int)
 #endif
 
-#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.
 
    ERR is the error code returned by one of the xstrto* functions.
@@ -72,8 +67,8 @@ _DECLARE_XSTRTOL (xstrtoull, unsigned long long int)
 
    After reporting an error, exit with a failure status.  */
 
-void xstrtol_fatal (enum strtol_error,
-                    int, char, struct option const *,
-                    char const *) _GL_ATTRIBUTE_NORETURN;
+void noreturn xstrtol_fatal (enum strtol_error,
+                             int, char, struct option const *,
+                             char const *);
 
 #endif /* not XSTRTOL_H_ */

diff --git a/modules/xstrtol b/modules/xstrtol
index 66e53427ebfce07f6dc2a63c0b17889424c5f08f..b7c79f156989d999c7ace6d38072c215cd90d10e 100644 (file)
--- a/modules/xstrtol
+++ b/modules/xstrtol
@@ -15,6 +15,7 @@ getopt-gnu
 gettext-h
 intprops
 inttypes-incomplete
+stdnoreturn
 
 configure.ac:
 gl_XSTRTOL