summaryrefslogtreecommitdiff
path: root/gdb/macrotab.h
diff options
context:
space:
mode:
authorChristian Biesinger <cbiesinger@google.com>2019-12-02 15:05:54 -0600
committerChristian Biesinger <cbiesinger@google.com>2019-12-06 13:19:02 -0600
commitdfb65191d80afcc7d8ce79d3d9f92ea2e1ab3fc9 (patch)
tree37f6f79d20d0a75a26e371b25a3b0e78e2737dc2 /gdb/macrotab.h
parent93e55f0a031b0e677d22aaba00857de902ebe685 (diff)
downloadbinutils-gdb-dfb65191d80afcc7d8ce79d3d9f92ea2e1ab3fc9.tar.gz
Put bcache inside "namespace gdb"
This avoids a conflict with a system "struct bcache" on Solaris (see e.g. https://www.isi.edu/nsnam/archive/ns-users/webarch/2001/msg05393.html) Note that the Solaris conflict for now only surfaces with --enable-targets=all (which the build bot doesn't use). gdb/ChangeLog: 2019-12-06 Christian Biesinger <cbiesinger@google.com> * bcache.c: Put in namespace gdb. * bcache.h: Likewise. * gdbtypes.c (check_types_worklist): Update. (types_deeply_equal): Update. * macrotab.c (struct macro_table) <bcache>: Update. (new_macro_table): Update. * macrotab.h (struct bcache): Put this forward declaration inside namespace gdb. (new_macro_table): Update. * objfiles.h (struct objfile_per_bfd_storage) <filename_cache>: Update. <macro_cache>: Update. * psymtab.h: (psymtab_storage) <psymbol_cache>: Update. Change-Id: I843d5e91f7ccb3db6d1099a8214c15a74510256f
Diffstat (limited to 'gdb/macrotab.h')
-rw-r--r--gdb/macrotab.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/gdb/macrotab.h b/gdb/macrotab.h
index 045d1625a19..83a7dfad23a 100644
--- a/gdb/macrotab.h
+++ b/gdb/macrotab.h
@@ -23,9 +23,12 @@
#include "gdbsupport/function-view.h"
struct obstack;
-struct bcache;
struct compunit_symtab;
+namespace gdb {
+struct bcache;
+}
+
/* How do we represent a source location? I mean, how should we
represent them within GDB; the user wants to use all sorts of
ambiguous abbreviations, like "break 32" and "break foo.c:32"
@@ -170,7 +173,7 @@ struct macro_source_file
the same source location (although 'gcc -DFOO -UFOO -DFOO=2' does
do that in GCC 4.1.2.). */
struct macro_table *new_macro_table (struct obstack *obstack,
- struct bcache *bcache,
+ gdb::bcache *bcache,
struct compunit_symtab *cust);