diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-22 20:27:55 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-22 20:27:55 +0000 |
| commit | ffa6564c9b13cea4b704e184d29d721f2cb061bb (patch) | |
| tree | b60af1323f18e06bcd185cef87750bfbcb366741 /include | |
| parent | 459621ac1a505ef7dee769295ee2e6c835b2314d (diff) | |
| parent | ae6296342a1e0785cafd6ce2530f022d187e20e7 (diff) | |
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')
| -rw-r--r-- | include/qemu/osdep.h | 3 | ||||
| -rw-r--r-- | include/qom/cpu.h | 1 |
2 files changed, 3 insertions, 1 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__ diff --git a/include/qom/cpu.h b/include/qom/cpu.h index 7052eee7b7..4a6def7117 100644 --- a/include/qom/cpu.h +++ b/include/qom/cpu.h @@ -20,7 +20,6 @@ #ifndef QEMU_CPU_H #define QEMU_CPU_H -#include <setjmp.h> #include "hw/qdev-core.h" #include "disas/bfd.h" #include "exec/hwaddr.h" |