diff options
| author | Peter Maydell | 2016-03-22 21:27:55 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-03-22 21:27:55 +0100 |
| commit | ffa6564c9b13cea4b704e184d29d721f2cb061bb (patch) | |
| tree | b60af1323f18e06bcd185cef87750bfbcb366741 /include/qemu/osdep.h | |
| parent | Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2016-03-21-tag' in... (diff) | |
| parent | wxx: Add support for ncurses (diff) | |
| download | qemu-ffa6564c9b13cea4b704e184d29d721f2cb061bb.tar.gz qemu-ffa6564c9b13cea4b704e184d29d721f2cb061bb.tar.xz qemu-ffa6564c9b13cea4b704e184d29d721f2cb061bb.zip | |
Merge remote-tracking branch 'remotes/weil/tags/pull-wxx-20160322' into staging
wxx patch queue
# gpg: Signature made Tue 22 Mar 2016 18:18:36 GMT using RSA key ID 677450AD
# gpg: Good signature from "Stefan Weil <sw@weilnetz.de>"
# gpg: aka "Stefan Weil <stefan.weil@weilnetz.de>"
# gpg: aka "Stefan Weil <stefan.weil@bib.uni-mannheim.de>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 4923 6FEA 75C9 5D69 8EC2 B78A E08C 21D5 6774 50AD
* remotes/weil/tags/pull-wxx-20160322:
wxx: Add support for ncurses
Remove unneeded include statements for setjmp.h
Include setjmp.h in qemu/osdep.h (bug fix for w64)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/osdep.h')
| -rw-r--r-- | include/qemu/osdep.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 4538fdca42..5bb374c3c6 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__ |