From 928dbe07562fa842a990d1c3aa65e12343426e68 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Mon, 9 Feb 2015 17:13:39 +0000 Subject: [PATCH] record-btrace.c: Remove redefinitions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The set_record_btrace_cmdlist and show_record_btrace_cmdlist objects are declared twice in the file, seemingly a simply copy/paste oversight. In C, the first time counts as forward declaration, but in C++, they are all definitions. That results in: src/gdb/record-btrace.c:80:33: error: redefinition of ‘cmd_list_element* set_record_btrace_cmdlist’ src/gdb/record-btrace.c:61:33: error: ‘cmd_list_element* set_record_btrace_cmdlist’ previously declared here src/gdb/record-btrace.c:81:33: error: redefinition of ‘cmd_list_element* show_record_btrace_cmdlist’ src/gdb/record-btrace.c:62:33: error: ‘cmd_list_element* show_record_btrace_cmdlist’ previously declared here gdb/ChangeLog: 2015-02-27 Pedro Alves * record-btrace.c (set_record_btrace_cmdlist) (show_record_btrace_cmdlist): Remove redefinitions. --- gdb/record-btrace.c | 4 ---- 1 file changed, 4 deletions(-) --- gdb/ChangeLog | 5 +++++ gdb/record-btrace.c | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d5a0737c187..291e89db322 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2015-02-27 Pedro Alves + + * record-btrace.c (set_record_btrace_cmdlist) + (show_record_btrace_cmdlist): Remove redefinitions. + 2015-02-27 Tom Tromey Pedro Alves diff --git a/gdb/record-btrace.c b/gdb/record-btrace.c index 102e0ebe94e..35c775a04b6 100644 --- a/gdb/record-btrace.c +++ b/gdb/record-btrace.c @@ -76,10 +76,6 @@ static struct btrace_config record_btrace_conf; /* Command list for "record btrace". */ static struct cmd_list_element *record_btrace_cmdlist; -/* Command lists for "set/show record btrace". */ -static struct cmd_list_element *set_record_btrace_cmdlist; -static struct cmd_list_element *show_record_btrace_cmdlist; - /* Command lists for "set/show record btrace bts". */ static struct cmd_list_element *set_record_btrace_bts_cmdlist; static struct cmd_list_element *show_record_btrace_bts_cmdlist; -- 2.30.2