Re: [Qemu-devel] [PATCH 2/2] pixman: fix warning

[Andreas Färber]

Am 09.01.2013 10:17, schrieb Gerd Hoffmann:
> Cc: address@hidden
> Cc: address@hidden
> Signed-off-by: Gerd Hoffmann <address@hidden>
> ---
>  include/ui/qemu-pixman.h |    7 +++++++
>  1 files changed, 7 insertions(+), 0 deletions(-)
> 
> diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h
> index 3c05c83..016fd87 100644
> --- a/include/ui/qemu-pixman.h
> +++ b/include/ui/qemu-pixman.h
> @@ -6,7 +6,14 @@
>  #ifndef QEMU_PIXMAN_H
>  #define QEMU_PIXMAN_H
>  
> +/* pixman-0.16.0 headers have a redundant declaration */
> +#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
> +#pragma GCC diagnostic ignored "-Wredundant-decls"
> +#endif
>  #include <pixman.h>
> +#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
> +#pragma GCC diagnostic error "-Wredundant-decls"
> +#endif
>  
>  #include "console.h"
>  

Unfortunately this did not help on SLES11 SP2. I don't spot any typo in
your patches, it looked neat; CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE does
not get defined in config-host.h it seems.

Using the pragmas unconditionally results in change from:

  CC    qemu-timer.o
cc1: warnings being treated as errors
In file included from
/home/andreas/QEMU/qemu-s390/include/ui/qemu-pixman.h:13,
                 from /home/andreas/QEMU/qemu-s390/include/ui/console.h:4,
                 from /home/andreas/QEMU/qemu-s390/qemu-timer.c:27:
/usr/include/pixman-1/pixman.h:225: error: redundant redeclaration of
‘pixman_transform_from_pixman_f_transform’
/usr/include/pixman-1/pixman.h:221: error: previous declaration of
‘pixman_transform_from_pixman_f_transform’ was here
make: *** [qemu-timer.o] Fehler 1

to:

  CC    qemu-timer.o
cc1: warnings being treated as errors
In file included from
/home/andreas/QEMU/qemu-s390/include/ui/qemu-pixman.h:13,
                 from /home/andreas/QEMU/qemu-s390/include/ui/console.h:4,
                 from /home/andreas/QEMU/qemu-s390/qemu-timer.c:27:
/usr/include/pixman-1/pixman.h:221: error: previous declaration of
‘pixman_transform_from_pixman_f_transform’ was here
make: *** [qemu-timer.o] Fehler 1

gcc (SUSE Linux) 4.3.4 [gcc-4_3-branch revision 152973]

Regards,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg