Patchwork [7/7] poison TARGET_xxx for compile once object

login
register
mail settings
Submitter Paolo Bonzini
Date June 25, 2010, 12:52 p.m.
Message ID <1277470342-5861-8-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/56970/
State New
Headers show

Comments

Paolo Bonzini - June 25, 2010, 12:52 p.m.
prevents those ifdefs from creeping in again.

Cc: Isaku Yamahata <yamahata@valinux.co.jp>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 cpu-common.h  |    4 ----
 qemu-common.h |    5 +----
 2 files changed, 1 insertions(+), 8 deletions(-)

Patch

diff --git a/cpu-common.h b/cpu-common.h
index d905258..639c58d 100644
--- a/cpu-common.h
+++ b/cpu-common.h
@@ -11,10 +11,6 @@ 
 #include "targphys.h"
 #endif
 
-#ifndef NEED_CPU_H
-#include "poison.h"
-#endif
-
 #include "bswap.h"
 #include "qemu-queue.h"
 
diff --git a/qemu-common.h b/qemu-common.h
index 8339cb1..423639b 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -86,15 +86,12 @@  static inline char *realpath(const char *path, char *resolved_path)
 
 /* FIXME: Remove NEED_CPU_H.  */
 #ifndef NEED_CPU_H
-
 #include <setjmp.h>
 #include "osdep.h"
 #include "bswap.h"
-
+#include "poison.h"
 #else
-
 #include "cpu.h"
-
 #endif /* !defined(NEED_CPU_H) */
 
 /* bottom halves */