On Tue, Sep 21, 2010 at 5:48 PM, Stefan Weil <w...@mail.berlios.de> wrote: > By moving the definition of GCC_ATTR and GCC_FMT_ATTR > from audio_int.h to qemu-common.h these macros are > now generally available for further patches which add > the gcc format attribute. > > Newer gcc versions support format gnu_printf which is > better suited for use in QEMU than format printf > (QEMU always uses standard format strings (even with mingw32)). > > V2: Use correct operator '==' (instead of '=') > > Cc: Blue Swirl <blauwir...@gmail.com> > Signed-off-by: Stefan Weil <w...@mail.berlios.de> > --- > audio/audio_int.h | 8 -------- > qemu-common.h | 16 ++++++++++++++++ > 2 files changed, 16 insertions(+), 8 deletions(-) > > diff --git a/audio/audio_int.h b/audio/audio_int.h > index f6a77ad..d8560b6 100644 > --- a/audio/audio_int.h > +++ b/audio/audio_int.h > @@ -236,14 +236,6 @@ static inline int audio_ring_dist (int dst, int src, int > len) > return (dst >= src) ? (dst - src) : (len - src + dst); > } > > -#if defined __GNUC__ > -#define GCC_ATTR __attribute__ ((__unused__, format (gnu_printf, 1, 2))) > -#define GCC_FMT_ATTR(n, m) __attribute__ ((format (gnu_printf, n, m)))
The patch doesn't apply, the above lines do not match HEAD.