@@ -153,8 +153,6 @@
/* opcodes/i386-dis.c r1.126 */
#include "qemu-common.h"
-#include <setjmp.h>
-
static int fetch_data2(struct disassemble_info *, bfd_byte *);
static int fetch_data(struct disassemble_info *, bfd_byte *);
static void ckprefix (void);
@@ -615,8 +615,6 @@ static const char *const reg_half_names[] =
/* Maximum length of an instruction. */
#define MAXLEN 22
-#include <setjmp.h>
-
struct private
{
/* Points to first byte not fetched. */
@@ -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"
@@ -141,7 +141,7 @@ for f in "$@"; do
perl -n -i -e 'print if !/\s*#\s*include\s*(["<][^>"]*[">])/ ||
! (grep { $_ eq $1 } qw (
"config-host.h" "qemu/compiler.h" "config.h"
- <stdarg.h> <stddef.h> <stdbool.h> <stdint.h> <sys/types.h>
+ <setjmp.h> <stdarg.h> <stddef.h> <stdbool.h> <stdint.h> <sys/types.h>
<stdlib.h> <stdio.h> <string.h> <strings.h> <inttypes.h>
<limits.h> <unistd.h> <time.h> <ctype.h> <errno.h> <fcntl.h>
<sys/stat.h> <sys/time.h> <assert.h> <signal.h>
@@ -26,7 +26,6 @@
#undef _FORTIFY_SOURCE
#endif
#include "qemu/osdep.h"
-#include <setjmp.h>
#include <pthread.h>
#include "qemu-common.h"
#include "qemu/coroutine_int.h"
@@ -23,7 +23,6 @@
#undef _FORTIFY_SOURCE
#endif
#include "qemu/osdep.h"
-#include <setjmp.h>
#include <ucontext.h>
#include "qemu-common.h"
#include "qemu/coroutine_int.h"
@@ -49,7 +49,6 @@
#include "qemu/sockets.h"
#include <sys/mman.h>
#include <libgen.h>
-#include <setjmp.h>
#include <sys/signal.h>
#ifdef CONFIG_LINUX
As soon as setjmp.h is included from qemu/osdep.h, those old include statements are no longer needed. Add also setjmp.h to the list in scripts/clean-includes. Signed-off-by: Stefan Weil <sw@weilnetz.de> --- This patch is based on my previous patch "Include setjmp.h in qemu/osdep.h (bug fix for w64)". disas/i386.c | 2 -- disas/m68k.c | 2 -- include/qom/cpu.h | 1 - scripts/clean-includes | 2 +- util/coroutine-sigaltstack.c | 1 - util/coroutine-ucontext.c | 1 - util/oslib-posix.c | 1 - 7 files changed, 1 insertion(+), 9 deletions(-)