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 6ccea751d5d7a1a3a0ffe117b8aa49979fe69258..75a56d9f2ea16658233e502b019845974c7d4837 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+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.

diff --git a/gdb/remote.c b/gdb/remote.c
index 2719241ee7e148225548a4c2561e809eb164eb2e..baa3ddafa99b12c54038446716b294bdeb0c9083 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 37e1f52938ddfb5eea85097ae855aac057c4f8fd..824d5728386f5538e7a04bf3ac6253ed3dfe2194 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 00c4d7cb18bb60c8458584324c04b5cb13256a67..4003c668c126ef87122ac0136418b24116bb6d3f 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);