aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/btrace.c1
-rw-r--r--gdb/common/ptid.c5
-rw-r--r--gdb/gdbserver/ChangeLog7
-rw-r--r--gdb/gdbserver/hostio-errno.c2
-rw-r--r--gdb/gdbserver/inferiors.c3
-rw-r--r--gdb/gdbserver/linux-x86-low.c2
-rw-r--r--gdb/gdbserver/notif.c1
-rw-r--r--gdb/nat/mips-linux-watch.c5
9 files changed, 28 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 460547b..144a527 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2014-07-30 Gary Benson <gbenson@redhat.com>
+
+ * btrace.c: Include defs.h.
+ * common/ptid.c: Include defs.h or server.h as appropriate.
+ * nat/mips-linux-watch.c: Likewise.
+
2014-07-29 Tom Tromey <tromey@redhat.com>
* target.c (target_is_pushed): Simplify.
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/ptid.c b/gdb/common/ptid.c
index f614669..04fd118 100644
--- a/gdb/common/ptid.c
+++ b/gdb/common/ptid.c
@@ -17,6 +17,11 @@
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 "ptid.h"
/* See ptid.h for these. */
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 60d2430..df20e8c 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,10 @@
+2014-07-30 Gary Benson <gbenson@redhat.com>
+
+ * hostio-errno.c: Move server.h to top of includes list.
+ * inferiors.c: Likewise.
+ * linux-x86-low.c: Likewise.
+ * notif.c: Include server.h.
+
2014-07-24 Tom Tromey <tromey@redhat.com>
Gary Benson <gbenson@redhat.com>
diff --git a/gdb/gdbserver/hostio-errno.c b/gdb/gdbserver/hostio-errno.c
index afe3c36..8817096 100644
--- a/gdb/gdbserver/hostio-errno.c
+++ b/gdb/gdbserver/hostio-errno.c
@@ -21,8 +21,8 @@
/* This file implements the hostio_last_error target callback
on top of errno. */
-#include <errno.h>
#include "server.h"
+#include <errno.h>
#include "gdb/fileio.h"
static int
diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c
index 8c1375f..48d7700 100644
--- a/gdb/gdbserver/inferiors.c
+++ b/gdb/gdbserver/inferiors.c
@@ -18,9 +18,8 @@
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 <stdlib.h>
-
#include "server.h"
+#include <stdlib.h>
#include "gdbthread.h"
#include "dll.h"
diff --git a/gdb/gdbserver/linux-x86-low.c b/gdb/gdbserver/linux-x86-low.c
index 9ba71e5..850ed7c 100644
--- a/gdb/gdbserver/linux-x86-low.c
+++ b/gdb/gdbserver/linux-x86-low.c
@@ -17,11 +17,11 @@
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 "server.h"
#include <stddef.h>
#include <signal.h>
#include <limits.h>
#include <inttypes.h>
-#include "server.h"
#include "linux-low.h"
#include "i387-fp.h"
#include "i386-low.h"
diff --git a/gdb/gdbserver/notif.c b/gdb/gdbserver/notif.c
index 8bc66dc..d69b2ed 100644
--- a/gdb/gdbserver/notif.c
+++ b/gdb/gdbserver/notif.c
@@ -47,6 +47,7 @@
# 3 is done by function 'handle_notif_ack'. */
+#include "server.h"
#include "notif.h"
static struct notif_server *notifs[] =
diff --git a/gdb/nat/mips-linux-watch.c b/gdb/nat/mips-linux-watch.c
index acfc7f4..ebe5523 100644
--- a/gdb/nat/mips-linux-watch.c
+++ b/gdb/nat/mips-linux-watch.c
@@ -15,6 +15,11 @@
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 <sys/ptrace.h>
#include "mips-linux-watch.h"
#include "gdb_assert.h"