aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Weil <sw@weilnetz.de>2016-03-14 15:47:05 +0100
committerStefan Weil <sw@weilnetz.de>2016-03-22 19:11:15 +0100
commit8ff98f1ed2f50cd05c3c5027c7efdf69859ec664 (patch)
tree0b5c568ec539ca129afb4e4d3c20abcdbcbd2094
parente89fdafb58038038e3ccb860c5e1068ba063bac8 (diff)
Remove unneeded include statements for setjmp.h
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>
-rw-r--r--disas/i386.c2
-rw-r--r--disas/m68k.c2
-rw-r--r--include/qom/cpu.h1
-rwxr-xr-xscripts/clean-includes2
-rw-r--r--util/coroutine-sigaltstack.c1
-rw-r--r--util/coroutine-ucontext.c1
-rw-r--r--util/oslib-posix.c1
7 files changed, 1 insertions, 9 deletions
diff --git a/disas/i386.c b/disas/i386.c
index d40b72ab10..394ffe14f3 100644
--- a/disas/i386.c
+++ b/disas/i386.c
@@ -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);
diff --git a/disas/m68k.c b/disas/m68k.c
index 0412ecd4b6..8f74ae1157 100644
--- a/disas/m68k.c
+++ b/disas/m68k.c
@@ -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. */
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"
diff --git a/scripts/clean-includes b/scripts/clean-includes
index 177d253eb9..fb2a49c3b8 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -140,7 +140,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>
diff --git a/util/coroutine-sigaltstack.c b/util/coroutine-sigaltstack.c
index 6b8aee7a2b..a7c3366553 100644
--- a/util/coroutine-sigaltstack.c
+++ b/util/coroutine-sigaltstack.c
@@ -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"
diff --git a/util/coroutine-ucontext.c b/util/coroutine-ucontext.c
index 4914f60199..2bb7e10d4b 100644
--- a/util/coroutine-ucontext.c
+++ b/util/coroutine-ucontext.c
@@ -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"
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 7615be4e7a..05c44ed4d2 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -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