Replace
    #pragma GCC diagnostic ignored FOO
    [Troublesome code...]
    #pragma GCC diagnostic error FOO
by
    #pragma GCC diagnostic push
    #pragma GCC diagnostic ignored FOO
    [Troublesome code...]
    #pragma GCC diagnostic pop
Broken in commit 3f4349d, commit 092bb30, and commit c95e308.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1366113066-1340-1-git-send-email-armbru@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
		
	
			
		
			
				
	
	
		
			57 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			57 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | 
						|
 * See the COPYING file in the top-level directory.
 | 
						|
 */
 | 
						|
 | 
						|
#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 push
 | 
						|
#pragma GCC diagnostic ignored "-Wredundant-decls"
 | 
						|
#endif
 | 
						|
#include <pixman.h>
 | 
						|
#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
 | 
						|
#pragma GCC diagnostic pop
 | 
						|
#endif
 | 
						|
 | 
						|
#include "qemu/typedefs.h"
 | 
						|
 | 
						|
/*
 | 
						|
 * pixman image formats are defined to be native endian,
 | 
						|
 * that means host byte order on qemu.  So we go define
 | 
						|
 * fixed formats here for cases where it is needed, like
 | 
						|
 * feeding libjpeg / libpng and writing screenshots.
 | 
						|
 */
 | 
						|
 | 
						|
#ifdef HOST_WORDS_BIGENDIAN
 | 
						|
# define PIXMAN_BE_r8g8b8     PIXMAN_r8g8b8
 | 
						|
#else
 | 
						|
# define PIXMAN_BE_r8g8b8     PIXMAN_b8g8r8
 | 
						|
#endif
 | 
						|
 | 
						|
/* -------------------------------------------------------------------- */
 | 
						|
 | 
						|
int qemu_pixman_get_type(int rshift, int gshift, int bshift);
 | 
						|
pixman_format_code_t qemu_pixman_get_format(PixelFormat *pf);
 | 
						|
 | 
						|
pixman_image_t *qemu_pixman_linebuf_create(pixman_format_code_t format,
 | 
						|
                                           int width);
 | 
						|
void qemu_pixman_linebuf_fill(pixman_image_t *linebuf, pixman_image_t *fb,
 | 
						|
                              int width, int x, int y);
 | 
						|
pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format,
 | 
						|
                                          pixman_image_t *image);
 | 
						|
void qemu_pixman_image_unref(pixman_image_t *image);
 | 
						|
 | 
						|
pixman_color_t qemu_pixman_color(PixelFormat *pf, uint32_t color);
 | 
						|
pixman_image_t *qemu_pixman_glyph_from_vgafont(int height, const uint8_t *font,
 | 
						|
                                               unsigned int ch);
 | 
						|
void qemu_pixman_glyph_render(pixman_image_t *glyph,
 | 
						|
                              pixman_image_t *surface,
 | 
						|
                              pixman_color_t *fgcol,
 | 
						|
                              pixman_color_t *bgcol,
 | 
						|
                              int x, int y, int cw, int ch);
 | 
						|
 | 
						|
#endif /* QEMU_PIXMAN_H */
 |