From 533b06003e8d358c33358560619fde1c774651ce Mon Sep 17 00:00:00 2001
From: Pedro Alves <palves@redhat.com>
Date: Thu, 5 Sep 2013 20:45:39 +0000
Subject: [PATCH] [gdbserver] Split a new hostio.h file out of server.h.

gdb/gdbserver/
2013-09-05  Pedro Alves  <palves@redhat.com>

	* server.h (handle_vFile, hostio_last_error_from_errno): Move
	to ...
	* hostio.h: ... this new file.
	* hostio.c, server.c, linux-low.c, nto-low.c, spu-low,
	win32-low.c: Include hostio.h.
---
 gdb/gdbserver/ChangeLog   | 8 ++++++++
 gdb/gdbserver/hostio.c    | 1 +
 gdb/gdbserver/linux-low.c | 1 +
 gdb/gdbserver/nto-low.c   | 1 +
 gdb/gdbserver/server.c    | 1 +
 gdb/gdbserver/server.h    | 6 ------
 gdb/gdbserver/spu-low.c   | 1 +
 gdb/gdbserver/win32-low.c | 1 +
 8 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 0c0034b272b..4df473b0864 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,11 @@
+2013-09-05  Pedro Alves  <palves@redhat.com>
+
+	* server.h (handle_vFile, hostio_last_error_from_errno): Move
+	to ...
+	* hostio.h: ... this new file.
+	* hostio.c, server.c, linux-low.c, nto-low.c, spu-low,
+	win32-low.c: Include hostio.h.
+
 2013-09-05  Pedro Alves  <palves@redhat.com>
 
 	* server.h (gdb_client_data, handler_func, callback_handler_func)
diff --git a/gdb/gdbserver/hostio.c b/gdb/gdbserver/hostio.c
index a74c2f880df..8edbadb45a2 100644
--- a/gdb/gdbserver/hostio.c
+++ b/gdb/gdbserver/hostio.c
@@ -20,6 +20,7 @@
 
 #include "server.h"
 #include "gdb/fileio.h"
+#include "hostio.h"
 
 #include <fcntl.h>
 #include <limits.h>
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 7c950589ec3..799fcc99af7 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -46,6 +46,7 @@
 #include <sys/uio.h>
 #include "filestuff.h"
 #include "tracepoint.h"
+#include "hostio.h"
 #ifndef ELFMAG0
 /* Don't include <linux/elf.h> here.  If it got included by gdb_proc_service.h
    then ELFMAG0 will have been defined.  If it didn't get included by
diff --git a/gdb/gdbserver/nto-low.c b/gdb/gdbserver/nto-low.c
index 36701337c8f..6f764ff5e21 100644
--- a/gdb/gdbserver/nto-low.c
+++ b/gdb/gdbserver/nto-low.c
@@ -21,6 +21,7 @@
 #include "server.h"
 #include "gdbthread.h"
 #include "nto-low.h"
+#include "hostio.h"
 
 #include <limits.h>
 #include <fcntl.h>
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 6ca7fe1a3d8..f4e152526e9 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -31,6 +31,7 @@
 #include "filestuff.h"
 #include "tracepoint.h"
 #include "dll.h"
+#include "hostio.h"
 
 /* The thread set with an `Hc' packet.  `Hc' is deprecated in favor of
    `vCont'.  Note the multi-process extensions made `vCont' a
diff --git a/gdb/gdbserver/server.h b/gdb/gdbserver/server.h
index 53127bf95a1..05724e03210 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -144,12 +144,6 @@ typedef int gdb_fildes_t;
 extern int handle_serial_event (int err, gdb_client_data client_data);
 extern int handle_target_event (int err, gdb_client_data client_data);
 
-/* Functions from hostio.c.  */
-extern int handle_vFile (char *, int, int *);
-
-/* Functions from hostio-errno.c.  */
-extern void hostio_last_error_from_errno (char *own_buf);
-
 #include "remote-utils.h"
 
 #include "common-utils.h"
diff --git a/gdb/gdbserver/spu-low.c b/gdb/gdbserver/spu-low.c
index e604b9f62bf..49b02a641f0 100644
--- a/gdb/gdbserver/spu-low.c
+++ b/gdb/gdbserver/spu-low.c
@@ -30,6 +30,7 @@
 #include <errno.h>
 #include <sys/syscall.h>
 #include "filestuff.h"
+#include "hostio.h"
 
 /* Some older glibc versions do not define this.  */
 #ifndef __WNOTHREAD
diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index a32cea4da26..979eedd5f80 100644
--- a/gdb/gdbserver/win32-low.c
+++ b/gdb/gdbserver/win32-low.c
@@ -26,6 +26,7 @@
 #include "win32-low.h"
 #include "gdbthread.h"
 #include "dll.h"
+#include "hostio.h"
 
 #include <stdint.h>
 #include <windows.h>
-- 
2.30.2