From 9312936603f4ed0de67aee3d1c4d714df16f995e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 14 Mar 2015 03:42:08 -0400 Subject: [PATCH] sim: move sim-io.h to sim-assert.h 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. --- 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 265758f5017..95ae4a47df8 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 3de8114fe5a..eaaf7919480 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 d2e19b78365..9e256c39ba5 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) -- 2.30.2