[RFA/gdbserver] Move malloc.h include to server.h.

[Joel Brobecker <brobecker@adacore.com>]

As discussed:

This patch moves all includes of malloc.h, which were introduced
purely to get access to alloca's declaration, to server.h, next
to the include of alloca.h.

There is one exception: gdbreplay.c, which does not include server.h.
In this case, the include of alloca.h was simply moved up a bit, next
to the include of malloc.h.

gdb/gdbserver/ChangeLog:

        * gdbserver/gdbreplay.c: Move include of alloca.h up, next to
        include of malloc.h.
        * gdbserver/server.h: Add include of malloc.h.
        * gdbserver/mem-break.c: Remove include of malloc.h.
        * gdbserver/server.c, gdbserver/tracepoint.c, gdbserver/utils.c,
        gdbserver/win32-low.c: Likewise.

Tested on x86_64-linux. I also verified that gdbserver still builds
on MinGW...

---
 gdb/gdbserver/gdbreplay.c  |    6 +++---
 gdb/gdbserver/mem-break.c  |    3 ---
 gdb/gdbserver/server.c     |    3 ---
 gdb/gdbserver/server.h     |    5 +++++
 gdb/gdbserver/tracepoint.c |    3 ---
 gdb/gdbserver/utils.c      |    3 ---
 gdb/gdbserver/win32-low.c  |    1 -
 7 files changed, 8 insertions(+), 16 deletions(-)

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
-- 
1.7.1