diff options
| author | Bruno Haible <bruno@clisp.org> | 2011-02-13 23:44:28 +0100 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2011-02-15 02:31:03 +0100 |
| commit | 59b191ed5bcff4198c9c89d0d52cec1880b9568d (patch) | |
| tree | cba5b114df46cf45177aaaecbae5f03cc10ca8dd /lib/xstrtol.h | |
| parent | f6a5a124d0cb326acd4dfa9ce3276baa26734b16 (diff) | |
| download | gnulib-59b191ed5bcff4198c9c89d0d52cec1880b9568d.tar.gz | |
Consistent macro naming for macros that use GCC __attribute__.
* lib/di-set.h (_GL_ATTRIBUTE_NONNULL): Renamed from
_ATTRIBUTE_NONNULL_.
* lib/ino-map.h (_GL_ATTRIBUTE_NONNULL): Likewise.
* lib/hash.h (_GL_ATTRIBUTE_WUR): Renamed from ATTRIBUTE_WUR.
* lib/ignore-value.h (_GL_ATTRIBUTE_DEPRECATED): Renamed from
ATTRIBUTE_DEPRECATED.
* lib/openat.h (_GL_ATTRIBUTE_NORETURN): Renamed from
ATTRIBUTE_NORETURN.
* lib/sigpipe-die.h (_GL_ATTRIBUTE_NORETURN): Likewise.
* lib/xmemdup0.h (_GL_ATTRIBUTE_NORETURN): Likewise.
* lib/xstrtol.h (_GL_ATTRIBUTE_NORETURN): Likewise.
* lib/xalloc.h (_GL_ATTRIBUTE_NORETURN): Likewise.
(_GL_ATTRIBUTE_MALLOC): Renamed from ATTRIBUTE_MALLOC.
(_GL_ATTRIBUTE_ALLOC_SIZE): Renamed from ATTRIBUTE_ALLOC_SIZE.
* lib/version-etc.h (_GL_ATTRIBUTE_SENTINEL): Renamed from
ATTRIBUTE_SENTINEL.
* lib/safe-alloc.h (_GL_ATTRIBUTE_RETURN_CHECK): Renamed from
ATTRIBUTE_RETURN_CHECK.
* tests/test-ignore-value.c (_GL_ATTRIBUTE_RETURN_CHECK): Likewise.
* tests/test-argmatch.c (_GL_ATTRIBUTE_NORETURN): Renamed from
ATTRIBUTE_NORETURN.
* tests/test-exclude.c (_GL_ATTRIBUTE_NORETURN): Likewise.
Reported by Paul Eggert.
Diffstat (limited to 'lib/xstrtol.h')
| -rw-r--r-- | lib/xstrtol.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/xstrtol.h b/lib/xstrtol.h index f91d864e06..716a94ff94 100644 --- a/lib/xstrtol.h +++ b/lib/xstrtol.h @@ -52,9 +52,9 @@ _DECLARE_XSTRTOL (xstrtoull, unsigned long long int) #endif #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8) -# define ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) +# define _GL_ATTRIBUTE_NORETURN __attribute__ ((__noreturn__)) #else -# define ATTRIBUTE_NORETURN /* empty */ +# define _GL_ATTRIBUTE_NORETURN /* empty */ #endif /* Report an error for an invalid integer in an option argument. @@ -74,6 +74,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_ */ |