[Qemu-devel] [PATCH 7/7] poison TARGET_xxx for compile once object

[Paolo Bonzini]

prevents those ifdefs from creeping in again.

Cc: Isaku Yamahata <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
 cpu-common.h  |    4 ----
 qemu-common.h |    5 +----
 2 files changed, 1 insertions(+), 8 deletions(-)

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 */
-- 
1.7.0.1