From: Stefan Weil <weil@mail.berlios.de>
Date: Sun, 26 Jun 2011 19:29:13 +0000 (+0000)
Subject: vnc: Fix compilation with --enable-vnc-png
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2fb0c09f4ff036f68474277ed4edc036f6529de8;p=qemu.git

vnc: Fix compilation with --enable-vnc-png

Commit f26e428da505709ec03b2ed2c9eb3db82b30bd7b fixed compilation
with --enable-vnc-png, but broke it with --enable-vnc-png.

The breakage is caused by pngconfig.h which checks whether
setjmp.h was already included and fails because qemu-common.h
includes setjmp.h.

The check is disabled by defining PNG_SKIP_SETJMP_CHECK.

Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c
index 6d36a7f7ae..5c02803411 100644
--- a/ui/vnc-enc-tight.c
+++ b/ui/vnc-enc-tight.c
@@ -34,6 +34,9 @@
 #include "qemu-common.h"
 
 #ifdef CONFIG_VNC_PNG
+/* The following define is needed by pngconf.h. Otherwise it won't compile,
+   because setjmp.h was already included by qemu-common.h. */
+#define PNG_SKIP_SETJMP_CHECK
 #include <png.h>
 #endif
 #ifdef CONFIG_VNC_JPEG