aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gdb')
-rw-r--r--gdb/gdbserver/ChangeLog8
-rw-r--r--gdb/gdbserver/gdbreplay.c6
-rw-r--r--gdb/gdbserver/mem-break.c3
-rw-r--r--gdb/gdbserver/server.c3
-rw-r--r--gdb/gdbserver/server.h5
-rw-r--r--gdb/gdbserver/tracepoint.c3
-rw-r--r--gdb/gdbserver/utils.c3
-rw-r--r--gdb/gdbserver/win32-low.c1
8 files changed, 16 insertions, 16 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 6f0adc9..71e878d 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,5 +1,13 @@
2010-09-01 Joel Brobecker <brobecker@adacore.com>
+ * gdbreplay.c: Move include of alloca.h up, next to include of
+ malloc.h.
+ * server.h: Add include of malloc.h.
+ * mem-break.c: Remove include of malloc.h.
+ * server.c, tracepoint.c, utils.c, win32-low.c: Likewise.
+
+2010-09-01 Joel Brobecker <brobecker@adacore.com>
+
* Makefile.in (memmem.o): Build with -Wno-error.
2010-09-01 Joel Brobecker <brobecker@adacore.com>
diff --git a/gdb/gdbserver/gdbreplay.c b/gdb/gdbserver/gdbreplay.c
index 4996ffa..1f65111 100644
--- a/gdb/gdbserver/gdbreplay.c
+++ b/gdb/gdbserver/gdbreplay.c
@@ -54,15 +54,15 @@
#if HAVE_NETINET_TCP_H
#include <netinet/tcp.h>
#endif
+#if HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
#if HAVE_MALLOC_H
#include <malloc.h>
#endif
#if USE_WIN32API
#include <winsock2.h>
#endif
-#if HAVE_ALLOCA_H
-#include <alloca.h>
-#endif
#ifndef HAVE_SOCKLEN_T
typedef int socklen_t;
diff --git a/gdb/gdbserver/mem-break.c b/gdb/gdbserver/mem-break.c
index 687414b..1b08415 100644
--- a/gdb/gdbserver/mem-break.c
+++ b/gdb/gdbserver/mem-break.c
@@ -20,9 +20,6 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "server.h"
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
const unsigned char *breakpoint_data;
int breakpoint_len;
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index c406abe..528b658 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -28,9 +28,6 @@
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
ptid_t cont_thread;
ptid_t general_thread;
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 286c80a..d5f32e8 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -41,6 +41,11 @@
#ifdef HAVE_ALLOCA_H
#include <alloca.h>
#endif
+/* On some systems such as MinGW, alloca is declared in malloc.h
+ (there is no alloca.h). */
+#if HAVE_MALLOC_H
+#include <malloc.h>
+#endif
#if !HAVE_DECL_STRERROR
#ifndef strerror
diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c
index f068ce4..138d920 100644
--- a/gdb/gdbserver/tracepoint.c
+++ b/gdb/gdbserver/tracepoint.c
@@ -22,9 +22,6 @@
#include <unistd.h>
#include <sys/time.h>
#include <stddef.h>
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
#if HAVE_STDINT_H
#include <stdint.h>
#endif
diff --git a/gdb/gdbserver/utils.c b/gdb/gdbserver/utils.c
index 7de086c..aee7e96 100644
--- a/gdb/gdbserver/utils.c
+++ b/gdb/gdbserver/utils.c
@@ -24,9 +24,6 @@
#if HAVE_ERRNO_H
#include <errno.h>
#endif
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
#ifdef IN_PROCESS_AGENT
# define PREFIX "ipa: "
diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index dd26d73..5aea8b9 100644
--- a/gdb/gdbserver/win32-low.c
+++ b/gdb/gdbserver/win32-low.c
@@ -31,7 +31,6 @@
#include <tlhelp32.h>
#include <psapi.h>
#include <sys/param.h>
-#include <malloc.h>
#include <process.h>
#ifndef USE_WIN32API