From patchwork Sat Mar 14 07:45:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 5612 Received: (qmail 102974 invoked by alias); 14 Mar 2015 07:45:13 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 102960 invoked by uid 89); 14 Mar 2015 07:45:12 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.4 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sat, 14 Mar 2015 07:45:11 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 8630D3407E6 for ; Sat, 14 Mar 2015 07:45:09 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: move sim-io.h to sim-assert.h Date: Sat, 14 Mar 2015 03:45:06 -0400 Message-Id: <1426319106-19298-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes Since sim-endian.c doesn't actually use sim_io funcs, it's weird to include the sim-io.h header here. It's doing so only for the assert header. So lets relocate the include to the right place. Committed. --- sim/common/ChangeLog | 6 ++++++ sim/common/sim-assert.h | 2 ++ sim/common/sim-endian.c | 1 - 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 265758f..95ae4a4 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,9 @@ +2015-03-14 Mike Frysinger + + * sim-assert.h [!SIM_ASSERT, WITH_ASSERT]: Include sim-io.h. + [!ASSERT, WITH_ASSERT]: Likewise. + * sim-endian.c: Delete sim-io.h include. + 2015-02-19 Mike Frysinger * run-sim.h (sim_kill): Delete unused prototype. diff --git a/sim/common/sim-assert.h b/sim/common/sim-assert.h index 3de8114..eaaf791 100644 --- a/sim/common/sim-assert.h +++ b/sim/common/sim-assert.h @@ -42,6 +42,7 @@ while (0) #if !defined (SIM_ASSERT) #if defined (WITH_ASSERT) +#include "sim-io.h" #define SIM_ASSERT(EXPRESSION) \ do \ { \ @@ -65,6 +66,7 @@ while (0) #if !defined (ASSERT) #if defined (WITH_ASSERT) +#include "sim-io.h" #define ASSERT(EXPRESSION) \ do \ { \ diff --git a/sim/common/sim-endian.c b/sim/common/sim-endian.c index d2e19b7..9e256c3 100644 --- a/sim/common/sim-endian.c +++ b/sim/common/sim-endian.c @@ -25,7 +25,6 @@ #include "sim-basics.h" #include "sim-assert.h" -#include "sim-io.h" #if !defined(_SWAP_1)