From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=54085 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OSD2G-0004OQ-AT
	for qemu-devel@nongnu.org; Fri, 25 Jun 2010 13:50:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <paolo.bonzini@gmail.com>) id 1OS8Ot-0002hQ-JG
	for qemu-devel@nongnu.org; Fri, 25 Jun 2010 08:52:57 -0400
Received: from mail-wy0-f173.google.com ([74.125.82.173]:50953)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <paolo.bonzini@gmail.com>) id 1OS8Ot-0002es-FH
	for qemu-devel@nongnu.org; Fri, 25 Jun 2010 08:52:55 -0400
Received: by mail-wy0-f173.google.com with SMTP id 42so3384263wyb.4
	for <qemu-devel@nongnu.org>; Fri, 25 Jun 2010 05:52:45 -0700 (PDT)
Sender: Paolo Bonzini <paolo.bonzini@gmail.com>
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Fri, 25 Jun 2010 14:52:22 +0200
Message-Id: <1277470342-5861-8-git-send-email-pbonzini@redhat.com>
In-Reply-To: <1277470342-5861-1-git-send-email-pbonzini@redhat.com>
References: <1277470342-5861-1-git-send-email-pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH 7/7] poison TARGET_xxx for compile once object
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Amit Shah <amit.shah@redhat.com>, Isaku Yamahata <yamahata@valinux.co.jp>

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(-)

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