* remote.c (unpack_varlen_hex): Remove forward declaration.

	(remote_console_output): Make static, and add forward declaration.
	* remote.h: Drop FIXME comment.
	(unpack_varlen_hex): Declare.
	(remote_console_output, remote_cisco_objfile_relocate)
	(deprecated_target_resume_hook, deprecated_target_wait_loop_hook):
	Delete declarations.
	* tracepoint.c: Include "remote.h".
	(unpack_varlen_hex): Delete declaration.

4 files changed, 16 insertions, 22 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fd2c936..06ae059 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,15 @@
+2010-05-27  Pedro Alves  <pedro@codesourcery.com>
+
+	* remote.c (unpack_varlen_hex): Remove forward declaration.
+	(remote_console_output): Make static, and add forward declaration.
+	* remote.h: Drop FIXME comment.
+	(unpack_varlen_hex): Declare.
+	(remote_console_output, remote_cisco_objfile_relocate)
+	(deprecated_target_resume_hook, deprecated_target_wait_loop_hook):
+	Delete declarations.
+	* tracepoint.c: Include "remote.h".
+	(unpack_varlen_hex): Delete declaration.
+
 2010-05-27  Tom Tromey  <tromey@redhat.com>
 
 	* dwarf2loc.c (struct piece_closure) <refc>: New field.
diff --git a/gdb/remote.c b/gdb/remote.c
index 16e577b..ca3aad6 100644
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -242,7 +242,7 @@ static void remote_terminal_ours (void);
 
 static int remote_read_description_p (struct target_ops *target);
 
-char *unpack_varlen_hex (char *buff, ULONGEST *result);
+static void remote_console_output (char *msg);
 
 /* The non-stop remote protocol provisions for one pending stop reply.
    This is where we keep it until it is acknowledged.  */
@@ -4668,7 +4668,7 @@ remote_terminal_ours (void)
   remote_async_terminal_ours_p = 1;
 }
 
-void
+static void
 remote_console_output (char *msg)
 {
   char *p;
diff --git a/gdb/remote.h b/gdb/remote.h
index d480e26..cdf11fb 100644
--- a/gdb/remote.h
+++ b/gdb/remote.h
@@ -22,8 +22,6 @@
 
 struct target_desc;
 
-/* FIXME?: move this interface down to tgt vector) */
-
 /* Read a packet from the remote machine, with error checking, and
    store it in *BUF.  Resize *BUF using xrealloc if necessary to hold
    the result, and update *SIZEOF_BUF.  If FOREVER, wait forever
@@ -40,19 +38,7 @@ extern void getpkt (char **buf, long *sizeof_buf, int forever);
 
 extern int putpkt (char *buf);
 
-/* Send HEX encoded string to the target console. (gdb_stdtarg) */
-
-extern void remote_console_output (char *);
-
-
-/* FIXME: cagney/1999-09-20: The remote cisco stuff in remote.c needs
-   to be broken out into a separate file (remote-cisco.[hc]?).  Before
-   that can happen, a remote protocol stack framework needs to be
-   implemented. */
-
-extern void remote_cisco_objfile_relocate (bfd_signed_vma text_off,
-					   bfd_signed_vma data_off,
-					   bfd_signed_vma bss_off);
+extern char *unpack_varlen_hex (char *buff, ULONGEST *result);
 
 extern void async_remote_interrupt_twice (void *arg);
 
@@ -61,9 +47,6 @@ extern int remote_write_bytes (CORE_ADDR memaddr, const gdb_byte *myaddr,
 
 extern int remote_read_bytes (CORE_ADDR memaddr, gdb_byte *myaddr, int len);
 
-extern void (*deprecated_target_resume_hook) (void);
-extern void (*deprecated_target_wait_loop_hook) (void);
-
 void register_remote_g_packet_guess (struct gdbarch *gdbarch, int bytes,
 				     const struct target_desc *tdesc);
 void register_remote_support_xml (const char *);
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 54904fb..0fb779e 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -46,6 +46,7 @@
 #include "gdbthread.h"
 #include "stack.h"
 #include "gdbcore.h"
+#include "remote.h"
 
 #include "ax.h"
 #include "ax-gdb.h"
@@ -3307,8 +3308,6 @@ tfile_interp_line (char *line,
 /* Parse the part of trace status syntax that is shared between
    the remote protocol and the trace file reader.  */
 
-extern char *unpack_varlen_hex (char *buff, ULONGEST *result);
-
 void
 parse_trace_status (char *line, struct trace_status *ts)
 {