2012-03-01 Pedro Alves <palves@redhat.com>

	* remote.c (encode_actions): Delete declaration.
	* tracepoint.c (encode_actions): Make extern.
	* tracepoint.h (encode_actions): Declare.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6ccea75..75a56d9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2012-03-01  Pedro Alves  <palves@redhat.com>
 
+       * remote.c (encode_actions): Delete declaration.
+       * tracepoint.c (encode_actions): Make extern.
+       * tracepoint.h (encode_actions): Declare.
+
+2012-03-01  Pedro Alves  <palves@redhat.com>
+
        * python/py-breakpoint.c: Include python.h.
        * python/py-continueevent.c (create_continue_event_object): Make
        static.

diff --git a/gdb/remote.c b/gdb/remote.c
index 2719241..baa3dda 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -69,9 +69,6 @@
 /* Temp hacks for tracepoint encoding migration.  */
 static char *target_buf;
 static long target_buf_size;
-/*static*/ void
-encode_actions (struct breakpoint *t, struct bp_location *tloc,
-               char ***tdp_actions, char ***stepping_actions);
 
 /* The size to align memory write packets, when practical.  The protocol
    does not guarantee any alignment, and gdb will generate short

diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 37e1f52..824d572 100644 (file)
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -1577,7 +1577,8 @@ encode_actions_1 (struct command_line *action,
 }
 
 /* Render all actions into gdb protocol.  */
-/*static*/ void
+
+void
 encode_actions (struct breakpoint *t, struct bp_location *tloc,
                char ***tdp_actions, char ***stepping_actions)
 {

diff --git a/gdb/tracepoint.h b/gdb/tracepoint.h
index 00c4d7c..4003c66 100644 (file)
--- a/gdb/tracepoint.h
+++ b/gdb/tracepoint.h
@@ -238,6 +238,9 @@ void free_actions (struct breakpoint *);
 
 extern char *decode_agent_options (char *exp);
 
+extern void encode_actions (struct breakpoint *t, struct bp_location *tloc,
+                           char ***tdp_actions, char ***stepping_actions);
+
 extern void validate_actionline (char **, struct breakpoint *);
 
 extern void end_actions_pseudocommand (char *args, int from_tty);