From: Pedro Alves <palves@redhat.com>
Date: Thu, 26 Feb 2015 14:03:47 +0000 (+0000)
Subject: More redefinition errors in C++ mode
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=bf36a1e7df75608045be60a5d16a1df207df3464;p=binutils-gdb.git

More redefinition errors in C++ mode

In C++, we can't forward declare objects like in C.  The compiler
complains about symbol redefinition.  Most cases of this were fixed in
e36122e9, but dtrace probes introduced a new one meanwhile.  This
patch fixes it the same way e36122e9 fixed the others.

gdb/
2015-02-27  Pedro Alves  <palves@redhat.com>

	* dtrace-probe.c (dtrace_probe_ops): Make extern.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 81ee82cfce8..32851c95f24 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2015-02-27  Pedro Alves  <palves@redhat.com>
+
+	* dtrace-probe.c (dtrace_probe_ops): Make extern.
+
 2015-02-27  Pedro Alves  <palves@redhat.com>
 
 	* common/common-exceptions.h (exception_none): Declare.
diff --git a/gdb/dtrace-probe.c b/gdb/dtrace-probe.c
index b24444926cb..491d8538e62 100644
--- a/gdb/dtrace-probe.c
+++ b/gdb/dtrace-probe.c
@@ -43,7 +43,7 @@
 
 /* Forward declaration.  */
 
-static const struct probe_ops dtrace_probe_ops;
+extern const struct probe_ops dtrace_probe_ops;
 
 /* The following structure represents a single argument for the
    probe.  */
@@ -865,7 +865,7 @@ dtrace_disable_probe (struct probe *probe)
 
 /* DTrace probe_ops.  */
 
-static const struct probe_ops dtrace_probe_ops =
+const struct probe_ops dtrace_probe_ops =
 {
   dtrace_probe_is_linespec,
   dtrace_get_probes,