X-Git-Url: https://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxstrtol.h;h=fe54f6afb3082529a77d050058897ef500c9e229;hb=25a6731afb775d2fe8ab53ea944158137d458462;hp=f91d864e06dd4b53e3314165ea39d13f7f0bb3f9;hpb=f6a5a124d0cb326acd4dfa9ce3276baa26734b16;p=gnulib.git diff --git a/lib/xstrtol.h b/lib/xstrtol.h index f91d864e0..fe54f6afb 100644 --- a/lib/xstrtol.h +++ b/lib/xstrtol.h @@ -1,6 +1,6 @@ /* A more useful interface to strtol. - Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2011 Free Software + Copyright (C) 1995-1996, 1998-1999, 2001-2004, 2006-2014 Free Software Foundation, Inc. This program is free software: you can redistribute it and/or modify @@ -51,12 +51,6 @@ _DECLARE_XSTRTOL (xstrtoll, long long int) _DECLARE_XSTRTOL (xstrtoull, unsigned long long int) #endif -#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8) -# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) -#else -# define 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 +66,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 *) ATTRIBUTE_NORETURN; +_Noreturn void xstrtol_fatal (enum strtol_error, + int, char, struct option const *, + char const *); #endif /* not XSTRTOL_H_ */