From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41711) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afX66-0002w3-N7 for qemu-devel@nongnu.org; Mon, 14 Mar 2016 14:20:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1afX62-00050f-MA for qemu-devel@nongnu.org; Mon, 14 Mar 2016 14:20:06 -0400 Received: from mail.weilnetz.de ([37.221.199.173]:49336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1afX62-00050V-FQ for qemu-devel@nongnu.org; Mon, 14 Mar 2016 14:20:02 -0400 References: <1457764306-3919-1-git-send-email-sw@weilnetz.de> <8760wph78l.fsf@blackfin.pond.sub.org> From: Stefan Weil Message-ID: <56E700CA.40406@weilnetz.de> Date: Mon, 14 Mar 2016 19:19:54 +0100 MIME-Version: 1.0 In-Reply-To: <8760wph78l.fsf@blackfin.pond.sub.org> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="aO95RRbmt7fqvgpcGwtauw4XSx6dmEQAv" Subject: Re: [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: Peter Maydell , Peter Crosthwaite , QEMU Developer , Andrew Baumann , Paolo Bonzini , Richard Henderson This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --aO95RRbmt7fqvgpcGwtauw4XSx6dmEQAv Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable Am 14.03.2016 um 08:02 schrieb Markus Armbruster: > Stefan Weil writes: [...] >> diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h >> index 4538fdc..5bb374c 100644 >> --- a/include/qemu/osdep.h >> +++ b/include/qemu/osdep.h >> @@ -76,6 +76,9 @@ extern int daemon(int, int); >> #include >> #include >> #include >> +/* setjmp must be declared before sysemu/os-win32.h >> + * because it is redefined there. */ >> +#include >> #include >> =20 >> #ifdef __OpenBSD__ >=20 > Please add to scripts/clean-includes. >=20 Thanks for this hint. I had already prepared a patch which removes the now unneeded setjmp.h include statements and added the modification for scripts/clean-includes to that patch now. Stefan --aO95RRbmt7fqvgpcGwtauw4XSx6dmEQAv 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 iQIcBAEBCAAGBQJW5wDOAAoJEOCMIdVndFCtgngP+gM7e/RMPzLMTtw0PjUc4h7/ EOaTEnIsyWP6zm53EKsDQXl+B6weRzCHm3KNlWI/E3Z41sNdhaGXZhnYmfIj1Fed /1pz3A+J0B8pSXEYo89RZpzbpgbU7cIp+G5LWlpbWHx7rYlgMRkJqLAFWFpCuyyM 2TFN5zvUMotojrq78ckovBvhuqDnUPjRX9wJcDa9nrPXIJWO9Z5suMY8R7NCOACy xLnaIkEaoI0qQllYHkV/kKZlTWsuZ/HJFB4Q7p5gTJhePzLBsF3mHzl96fiyh9TY ijNJ8qBJbFeidgbXfkKNA7JVhXYdZ++8aoGNHRPTWDnlgcgDoU4d/BUOq1TFf0fD ZiggR16CdFIXSQsffSeyAVjUcnIWLCaViGl4LwSGph5W09akW6b3CHPZ8XQlACxs R07So+78tX/8IQGiuImHBnTt9tn6GrJ+f+8V2GVxQD37mPGh5untGkLprRbdbM+a p8X4sxEOGdyr7VoYTCVn9g6uYzy3ni5FcmRdbBGjDw1DFvGrEd8hsoF55gMad2S9 h2dti+K1s8YAL7olBdUs5lu5ifL6fEoz4vzxEfHZ66kAJKawWJFMFl4nyt5LKdlI HZAFxN6vfdUECHh5Iyv3bq0CuxA9259+QUrHWtGEEunVhxS9uayG6C20koZdsz5g Dfh2+sBIx39/rJCshD4K =v77b -----END PGP SIGNATURE----- --aO95RRbmt7fqvgpcGwtauw4XSx6dmEQAv--