diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-14 20:53:29 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-14 20:53:29 -0800 |
commit | bb55f713d2e4ea089a861a257d7d000432642ce9 (patch) | |
tree | 92cf79666025c70a6541e87cb47ab8299c5f92af /lib/ignore-value.h | |
parent | 8017fd6b81ed07c1ff3adf7494c867f9a2b034a9 (diff) | |
download | emacs-bb55f713d2e4ea089a861a257d7d000432642ce9.tar.gz |
Merge from gnulib.
Diffstat (limited to 'lib/ignore-value.h')
-rw-r--r-- | lib/ignore-value.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ignore-value.h b/lib/ignore-value.h index 5e683bbb533..f021a1ac8ea 100644 --- a/lib/ignore-value.h +++ b/lib/ignore-value.h @@ -35,13 +35,13 @@ #ifndef _GL_IGNORE_VALUE_H # define _GL_IGNORE_VALUE_H -# ifndef ATTRIBUTE_DEPRECATED +# ifndef _GL_ATTRIBUTE_DEPRECATED /* The __attribute__((__deprecated__)) feature is available in gcc versions 3.1 and newer. */ # if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 1) -# define ATTRIBUTE_DEPRECATED /* empty */ +# define _GL_ATTRIBUTE_DEPRECATED /* empty */ # else -# define ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) +# define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__)) # endif # endif @@ -56,7 +56,7 @@ /* ignore_value works for scalars, pointers and aggregates; deprecate ignore_ptr. */ -static inline void ATTRIBUTE_DEPRECATED +static inline void _GL_ATTRIBUTE_DEPRECATED ignore_ptr (void *p) { (void) p; } /* deprecated: use ignore_value */ #endif |