From 1947382c6e35c0aa45a9039b5734313246fb45d8 Mon Sep 17 00:00:00 2001 From: Horst Schirmeier Date: Sun, 9 Feb 2014 23:51:39 +0100 Subject: [PATCH] sal: avoid include cycle Enabling both CONFIG_FAST_BREAKPOINTS / CONFIG_FAST_WATCHPOINTS and CONFIG_EVENT_BREAKPOINTS / CONFIG_EVENT_BREAKPOINTS_RANGE / CONFIG_EVENT_MEMREAD / CONFIG_EVENT_MEMWRITE led to an (unnecessary) include cycle. Change-Id: I8144e3e72da69b98e21a844a4bfded1b77bdce07 --- src/core/sal/panda/PandaBreakpoints.ah | 1 - src/core/sal/panda/PandaWatchpoints.ah | 1 - src/core/sal/perf/FastWatchpoints.ah | 1 - 3 files changed, 3 deletions(-) diff --git a/src/core/sal/panda/PandaBreakpoints.ah b/src/core/sal/panda/PandaBreakpoints.ah index 95df3afb..8d79d01c 100644 --- a/src/core/sal/panda/PandaBreakpoints.ah +++ b/src/core/sal/panda/PandaBreakpoints.ah @@ -6,7 +6,6 @@ #if defined(BUILD_PANDA) && defined(CONFIG_EVENT_BREAKPOINTS) -#include "../SALInst.hpp" #include "../../../debuggers/openocd/openocd_wrapper.hpp" aspect PandaBreakpoints diff --git a/src/core/sal/panda/PandaWatchpoints.ah b/src/core/sal/panda/PandaWatchpoints.ah index 309e3a8b..e8d45854 100644 --- a/src/core/sal/panda/PandaWatchpoints.ah +++ b/src/core/sal/panda/PandaWatchpoints.ah @@ -6,7 +6,6 @@ #if defined(BUILD_PANDA) && defined(CONFIG_EVENT_MEMREAD) && defined(CONFIG_EVENT_MEMWRITE) -#include "../SALInst.hpp" #include "../../../debuggers/openocd/openocd_wrapper.hpp" aspect PandaWatchpoints diff --git a/src/core/sal/perf/FastWatchpoints.ah b/src/core/sal/perf/FastWatchpoints.ah index 1199654f..59279eee 100644 --- a/src/core/sal/perf/FastWatchpoints.ah +++ b/src/core/sal/perf/FastWatchpoints.ah @@ -12,7 +12,6 @@ #include "WatchpointManagerSlice.ah" // slice class "WatchpointManagerSlice" #include "WatchpointControllerSlice.ah" // slice class "WatchpointControllerSlice" #include "../ListenerManager.hpp" -#include "../Listener.hpp" #include "WatchpointBuffer.hpp" #include "../SALInst.hpp"