From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qb4z0-0006Fb-7k for qemu-devel@nongnu.org; Mon, 27 Jun 2011 02:07:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qb4yy-00064v-0p for qemu-devel@nongnu.org; Mon, 27 Jun 2011 02:07:42 -0400 Received: from fmmailgate02.web.de ([217.72.192.227]:35445) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qb4yx-00064Z-DF for qemu-devel@nongnu.org; Mon, 27 Jun 2011 02:07:39 -0400 Message-ID: <4E081E24.6090008@web.de> Date: Mon, 27 Jun 2011 08:07:32 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <20110626230312.56C4F3FC03@buildbot.b1-systems.de> <1309152553-25693-1-git-send-email-weil@mail.berlios.de> In-Reply-To: <1309152553-25693-1-git-send-email-weil@mail.berlios.de> Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigF4423874E09D2CE9602D65D0" Sender: jan.kiszka@web.de Subject: Re: [Qemu-devel] [PATCH] vnc: Fix compilation with --enable-vnc-png List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil Cc: Blue Swirl , qemu-devel@nongnu.org This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigF4423874E09D2CE9602D65D0 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable On 2011-06-27 07:29, Stefan Weil wrote: > Commit f26e428da505709ec03b2ed2c9eb3db82b30bd7b fixed compilation > with --enable-vnc-png, but broke it with --enable-vnc-png. >=20 > The breakage is caused by pngconfig.h which checks whether > setjmp.h was already included and fails because qemu-common.h > includes setjmp.h. >=20 > 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 >=20 > Cc: Blue Swirl > Signed-off-by: Stefan Weil > --- > ui/vnc-enc-tight.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) >=20 > 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" > =20 > #ifdef CONFIG_VNC_PNG > +/* The following define is needed by pngconf.h. Otherwise it won't com= pile, > + because setjmp.h was already included by qemu-common.h. */ > +#define PNG_SKIP_SETJMP_CHECK > #include > #endif > #ifdef CONFIG_VNC_JPEG --------------enigF4423874E09D2CE9602D65D0 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org/ iEYEARECAAYFAk4IHikACgkQitSsb3rl5xShbwCdFpZdyR5AVcJUZ8SFknBHFVLy YKoAnAvB7KW1cb3IASMqOIp3OsdgJmgD =JI6w -----END PGP SIGNATURE----- --------------enigF4423874E09D2CE9602D65D0--