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/ino-map.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/ino-map.h')
| -rw-r--r-- | lib/ino-map.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/ino-map.h b/lib/ino-map.h index e060af024f..b7422912f2 100644 --- a/lib/ino-map.h +++ b/lib/ino-map.h @@ -3,17 +3,17 @@ # include <sys/types.h> -# undef _ATTRIBUTE_NONNULL_ +# undef _GL_ATTRIBUTE_NONNULL # if __GNUC__ == 3 && __GNUC_MINOR__ >= 3 || 3 < __GNUC__ -# define _ATTRIBUTE_NONNULL_(m) __attribute__ ((__nonnull__ (m))) +# define _GL_ATTRIBUTE_NONNULL(m) __attribute__ ((__nonnull__ (m))) # else -# define _ATTRIBUTE_NONNULL_(m) +# define _GL_ATTRIBUTE_NONNULL(m) # endif # define INO_MAP_INSERT_FAILURE ((size_t) -1) struct ino_map *ino_map_alloc (size_t); -void ino_map_free (struct ino_map *) _ATTRIBUTE_NONNULL_ (1); -size_t ino_map_insert (struct ino_map *, ino_t) _ATTRIBUTE_NONNULL_ (1); +void ino_map_free (struct ino_map *) _GL_ATTRIBUTE_NONNULL (1); +size_t ino_map_insert (struct ino_map *, ino_t) _GL_ATTRIBUTE_NONNULL (1); #endif |