aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2011-06-26 19:29:13 +0000
committerAnthony Liguori <aliguori@us.ibm.com>2011-06-27 10:21:34 -0500
commit2fb0c09f4ff036f68474277ed4edc036f6529de8 (patch)
tree96a95ce077e2ee7c03cbceab4639c174c1574868
parentf26e428da505709ec03b2ed2c9eb3db82b30bd7b (diff)
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>
-rw-r--r--ui/vnc-enc-tight.c3
1 files changed, 3 insertions, 0 deletions
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