[packages/xen.git] / odd-glib2-fix.patch

--- xen-4.4.0/tools/qemu-xen/ui/vnc-enc-tight.c.orig	2014-03-14 11:53:18.512514455 +0000
+++ xen-4.4.0/tools/qemu-xen/ui/vnc-enc-tight.c	2014-03-14 15:03:52.245475390 +0000
@@ -31,7 +31,6 @@
 /* This needs to be before jpeglib.h line because of conflict with
    INT32 definitions between jmorecfg.h (included by jpeglib.h) and
    Win32 basetsd.h (included by windows.h). */
-#include "qemu-common.h"
 
 #ifdef CONFIG_VNC_PNG
 /* The following define is needed by pngconf.h. Otherwise it won't compile,
@@ -44,6 +43,8 @@
 #include <jpeglib.h>
 #endif
 
+#include "qemu-common.h"
+
 #include "qemu/bswap.h"
 #include "qapi/qmp/qint.h"
 #include "vnc.h"
Commit	Line	Data
78fdf904 MM	1	--- xen-4.4.0/tools/qemu-xen/ui/vnc-enc-tight.c.orig 2014-03-14 11:53:18.512514455 +0000
	2	+++ xen-4.4.0/tools/qemu-xen/ui/vnc-enc-tight.c 2014-03-14 15:03:52.245475390 +0000
	3	@@ -31,7 +31,6 @@
	4	/* This needs to be before jpeglib.h line because of conflict with
	5	INT32 definitions between jmorecfg.h (included by jpeglib.h) and
	6	Win32 basetsd.h (included by windows.h). */
	7	-#include "qemu-common.h"
	8
	9	#ifdef CONFIG_VNC_PNG
	10	/* The following define is needed by pngconf.h. Otherwise it won't compile,
	11	@@ -44,6 +43,8 @@
	12	#include <jpeglib.h>
	13	#endif
	14
	15	+#include "qemu-common.h"
	16	+
	17	#include "qemu/bswap.h"
	18	#include "qapi/qmp/qint.h"
	19	#include "vnc.h"