GCC_ATTR was only used in audio_int.h, so it is now unused and the definition can be removed from compiler.h.
Signed-off-by: Stefan Weil <s...@weilnetz.de> --- audio/audio_int.h | 8 +++----- include/qemu/compiler.h | 3 --- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/audio/audio_int.h b/audio/audio_int.h index b9b0676..5a6284b 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -243,7 +243,7 @@ static inline int audio_ring_dist (int dst, int src, int len) return (dst >= src) ? (dst - src) : (len - src + dst); } -static void GCC_ATTR dolog (const char *fmt, ...) +static inline void GCC_FMT_ATTR(1, 2) dolog (const char *fmt, ...) { va_list ap; @@ -253,7 +253,7 @@ static void GCC_ATTR dolog (const char *fmt, ...) } #ifdef DEBUG -static void GCC_ATTR ldebug (const char *fmt, ...) +static inline void GCC_FMT_ATTR(1, 2) ldebug (const char *fmt, ...) { va_list ap; @@ -267,15 +267,13 @@ static void GCC_ATTR ldebug (const char *fmt, ...) #elif defined NDEBUG && defined _MSC_VER #define ldebug __noop #else -static void GCC_ATTR ldebug (const char *fmt, ...) +static inline void GCC_FMT_ATTR(1, 2) ldebug (const char *fmt, ...) { (void) fmt; } #endif #endif -#undef GCC_ATTR - #define AUDIO_STRINGIFY_(n) #n #define AUDIO_STRINGIFY(n) AUDIO_STRINGIFY_(n) diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index 6175c24..155b358 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -38,11 +38,9 @@ #if defined __GNUC__ # if !QEMU_GNUC_PREREQ(4, 4) /* gcc versions before 4.4.x don't support gnu_printf, so use printf. */ -# define GCC_ATTR __attribute__((__unused__, format(printf, 1, 2))) # define GCC_FMT_ATTR(n, m) __attribute__((format(printf, n, m))) # else /* Use gnu_printf when supported (qemu uses standard format strings). */ -# define GCC_ATTR __attribute__((__unused__, format(gnu_printf, 1, 2))) # define GCC_FMT_ATTR(n, m) __attribute__((format(gnu_printf, n, m))) # if defined(_WIN32) /* Map __printf__ to __gnu_printf__ because we want standard format strings @@ -51,7 +49,6 @@ # endif # endif #else -#define GCC_ATTR /**/ #define GCC_FMT_ATTR(n, m) #endif -- 1.7.10.4