[PATCH 08/15 v2] Make btrace-common.h not use GDBSERVER

Gary Benson
2014-07-16T17:03:19Z

This changes btrace-common.h not to include defs.h or server.h.
Instead it moves the defs.h include to btrace.c.

gdb/
2014-07-16 Tom Tromey <tromey@redhat.com>

* btrace.c: Include defs.h.
* common/btrace-common.h: Don't include server.h or defs.h.
---
gdb/ChangeLog | 5 +++++
gdb/btrace.c | 1 +
gdb/common/btrace-common.h | 6 ------
3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gdb/btrace.c b/gdb/btrace.c
index 87a171e..b5c3c26 100644
--- a/gdb/btrace.c
+++ b/gdb/btrace.c
@@ -19,6 +19,7 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */

+#include "defs.h"
#include "btrace.h"
#include "gdbthread.h"
#include "exceptions.h"
diff --git a/gdb/common/btrace-common.h b/gdb/common/btrace-common.h
index 25617bb..339e684 100644
--- a/gdb/common/btrace-common.h
+++ b/gdb/common/btrace-common.h
@@ -26,12 +26,6 @@
inferior. For presentation purposes, the branch trace is represented as a
list of sequential control-flow blocks, one such list per thread. */

-#ifdef GDBSERVER
-# include "server.h"
-#else
-# include "defs.h"
-#endif
-
#include "vec.h"

/* A branch trace block.
--
1.7.1