On 2011-06-27 07:29, Stefan Weil wrote: > 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.
Did you check if "You can bypass this test if you know that your application uses exactly the same setjmp.h that was included when libpng was built." (from /usr/include/pngconf.h) applies for us in all supported cases? Jan > > Cc: Blue Swirl <blauwir...@gmail.com> > Signed-off-by: Stefan Weil <w...@mail.berlios.de> > --- > ui/vnc-enc-tight.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/ui/vnc-enc-tight.c b/ui/vnc-enc-tight.c > index 6d36a7f..5c02803 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
signature.asc
Description: OpenPGP digital signature
