aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/nat/linux-btrace.c8
-rw-r--r--gdb/nat/linux-btrace.h2
3 files changed, 9 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2e18116..bb0a9e8 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
2014-09-12 Gary Benson <gbenson@redhat.com>
+ * nat/linux-btrace.c: Include common-defs.h.
+ Don't include defs.h, server.h or gdbthread.h.
+ * nat/linux-btrace.h (struct target_ops): New forward declaration.
+
+2014-09-12 Gary Benson <gbenson@redhat.com>
+
* common/agent.c: Include common-defs.h.
Don't include defs.h or server.h.
* common/buffer.c: Likewise.
diff --git a/gdb/nat/linux-btrace.c b/gdb/nat/linux-btrace.c
index 385ca4e..37c85c0 100644
--- a/gdb/nat/linux-btrace.c
+++ b/gdb/nat/linux-btrace.c
@@ -19,15 +19,9 @@
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef GDBSERVER
-#include "server.h"
-#else
-#include "defs.h"
-#endif
-
+#include "common-defs.h"
#include "linux-btrace.h"
#include "common-regcache.h"
-#include "gdbthread.h"
#include "gdb_wait.h"
#include "x86-cpuid.h"
diff --git a/gdb/nat/linux-btrace.h b/gdb/nat/linux-btrace.h
index 28a7176..e4b2604 100644
--- a/gdb/nat/linux-btrace.h
+++ b/gdb/nat/linux-btrace.h
@@ -30,6 +30,8 @@
# include <linux/perf_event.h>
#endif
+struct target_ops;
+
/* Branch trace target information per thread. */
struct btrace_target_info
{