Message ID | 1309805099-11262-1-git-send-email-weil@mail.berlios.de |
---|---|
State | Superseded |
Headers | show |
Am 04.07.2011 20:44, schrieb Stefan Weil: > Some versions of png.h cannot be included after setjmp.h, > even when PNG_SKIP_SETJMP_CHECK was defined. > > setjmp.h was included from qemu-common.h and is not needed there. > Removing the include statement fixes compilation of ui/vnc-enc-tight.c > with CONFIG_VNC_PNG defined. > > Signed-off-by: Stefan Weil<weil@mail.berlios.de> > --- Sorry, I noticed that the subject is not correct ("with on") after I had sent the patch. Please use patch v2. Stefan
diff --git a/qemu-common.h b/qemu-common.h index abd7a75..c2b79bd 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -117,7 +117,6 @@ static inline char *realpath(const char *path, char *resolved_path) /* FIXME: Remove NEED_CPU_H. */ #ifndef NEED_CPU_H -#include <setjmp.h> #include "osdep.h" #include "bswap.h"
Some versions of png.h cannot be included after setjmp.h, even when PNG_SKIP_SETJMP_CHECK was defined. setjmp.h was included from qemu-common.h and is not needed there. Removing the include statement fixes compilation of ui/vnc-enc-tight.c with CONFIG_VNC_PNG defined. Signed-off-by: Stefan Weil <weil@mail.berlios.de> --- qemu-common.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)