qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Weil <sw@weilnetz.de>
To: QEMU Developer <qemu-devel@nongnu.org>,
	Andrew Baumann <Andrew.Baumann@microsoft.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>, Stefan Weil <sw@weilnetz.de>,
	Richard Henderson <rth@twiddle.net>,
	Peter Crosthwaite <crosthwaite.peter@gmail.com>
Subject: [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64)
Date: Sat, 12 Mar 2016 07:31:46 +0100	[thread overview]
Message-ID: <1457764306-3919-1-git-send-email-sw@weilnetz.de> (raw)

setjmp must be declared before sysemu/os-win32.h
because it is redefined there for 64 bit Windows.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---

This patch superseeds my previous patch
"Use special code for sigsetjmp only in cpu-exec.c".

It is needed for QEMU on 64 bit Windows to get the
correct definition of setjmp (without stack unwinding).

Regards,
Stefan


 include/qemu/osdep.h | 3 +++
 1 file changed, 3 insertions(+)

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 <sys/stat.h>
 #include <sys/time.h>
 #include <assert.h>
+/* setjmp must be declared before sysemu/os-win32.h
+ * because it is redefined there. */
+#include <setjmp.h>
 #include <signal.h>
 
 #ifdef __OpenBSD__
-- 
2.1.4

             reply	other threads:[~2016-03-12  6:32 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-12  6:31 Stefan Weil [this message]
2016-03-12 20:54 ` [Qemu-devel] [PATCH] Include setjmp.h in qemu/osdep.h (bug fix for w64) Richard Henderson
2016-03-14  7:02 ` Markus Armbruster
2016-03-14 18:19   ` Stefan Weil
2016-03-14 18:21 ` Andrew Baumann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1457764306-3919-1-git-send-email-sw@weilnetz.de \
    --to=sw@weilnetz.de \
    --cc=Andrew.Baumann@microsoft.com \
    --cc=crosthwaite.peter@gmail.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).