From 799cdc37289ab867a0c2f8d57eae4551fc16b9b2 Mon Sep 17 00:00:00 2001
From: Pedro Alves <palves@redhat.com>
Date: Thu, 5 Sep 2013 20:41:55 +0000
Subject: [PATCH] [gdbserver] Split a new dll.h file out of server.h.

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

	* dll.c, inferiors.c, remote-utils.c, server.c: Include "dll.h".
	* server.h (struct dll_info, all_dlls, dlls_changed, clear_dlls)
	(loaded_dll, unloaded_dll): Move to ...
	* dll.h: ... this new file.
	* inferiors.c, remote-utils.c, win32-low.c: Include "dll.h".
---
 gdb/gdbserver/ChangeLog      |  8 ++++++++
 gdb/gdbserver/dll.c          |  1 +
 gdb/gdbserver/inferiors.c    |  1 +
 gdb/gdbserver/remote-utils.c |  2 ++
 gdb/gdbserver/server.c       |  1 +
 gdb/gdbserver/server.h       | 16 ----------------
 gdb/gdbserver/win32-low.c    |  1 +
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 438673d4019..d9f55da347e 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,11 @@
+2013-09-05  Pedro Alves  <palves@redhat.com>
+
+	* dll.c, inferiors.c, remote-utils.c, server.c: Include "dll.h".
+	* server.h (struct dll_info, all_dlls, dlls_changed, clear_dlls)
+	(loaded_dll, unloaded_dll): Move to ...
+	* dll.h: ... this new file.
+	* inferiors.c, remote-utils.c, win32-low.c: Include "dll.h".
+
 2013-09-05  Pedro Alves  <palves@redhat.com>
 
 	* server.h (current_process, get_thread_process, all_processes)
diff --git a/gdb/gdbserver/dll.c b/gdb/gdbserver/dll.c
index e4873eb5f5b..74978e27b4f 100644
--- a/gdb/gdbserver/dll.c
+++ b/gdb/gdbserver/dll.c
@@ -16,6 +16,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
+#include "dll.h"
 
 #define get_dll(inf) ((struct dll_info *)(inf))
 
diff --git a/gdb/gdbserver/inferiors.c b/gdb/gdbserver/inferiors.c
index 39eb52ea386..5f974ca3f99 100644
--- a/gdb/gdbserver/inferiors.c
+++ b/gdb/gdbserver/inferiors.c
@@ -22,6 +22,7 @@
 
 #include "server.h"
 #include "gdbthread.h"
+#include "dll.h"
 
 struct inferior_list all_processes;
 struct inferior_list all_threads;
diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c
index 5cd6fa14c2d..8e8a4d6f5f7 100644
--- a/gdb/gdbserver/remote-utils.c
+++ b/gdb/gdbserver/remote-utils.c
@@ -21,6 +21,8 @@
 #include "target.h"
 #include "gdbthread.h"
 #include "tdesc.h"
+#include "dll.h"
+
 #include <stdio.h>
 #include <string.h>
 #if HAVE_SYS_IOCTL_H
diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 3c702885ba6..6ca7fe1a3d8 100644
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -30,6 +30,7 @@
 #include "btrace-common.h"
 #include "filestuff.h"
 #include "tracepoint.h"
+#include "dll.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 a6961215b44..ab527386f13 100644
--- a/gdb/gdbserver/server.h
+++ b/gdb/gdbserver/server.h
@@ -102,26 +102,10 @@ typedef unsigned long long ULONGEST;
 #include "gdbthread.h"
 #include "inferiors.h"
 
-struct dll_info
-{
-  struct inferior_list_entry entry;
-  char *name;
-  CORE_ADDR base_addr;
-};
-
 /* Target-specific functions */
 
 void initialize_low ();
 
-/* From dll.c.  */
-
-extern struct inferior_list all_dlls;
-extern int dlls_changed;
-extern void clear_dlls (void);
-
-void loaded_dll (const char *name, CORE_ADDR base_addr);
-void unloaded_dll (const char *name, CORE_ADDR base_addr);
-
 /* Public variables in server.c */
 
 extern ptid_t cont_thread;
diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index 549c29f0825..a32cea4da26 100644
--- a/gdb/gdbserver/win32-low.c
+++ b/gdb/gdbserver/win32-low.c
@@ -25,6 +25,7 @@
 #include "mem-break.h"
 #include "win32-low.h"
 #include "gdbthread.h"
+#include "dll.h"
 
 #include <stdint.h>
 #include <windows.h>
-- 
2.30.2