From dfb65191d80afcc7d8ce79d3d9f92ea2e1ab3fc9 Mon Sep 17 00:00:00 2001 From: Christian Biesinger Date: Mon, 2 Dec 2019 15:05:54 -0600 Subject: 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 * bcache.c: Put in namespace gdb. * bcache.h: Likewise. * gdbtypes.c (check_types_worklist): Update. (types_deeply_equal): Update. * macrotab.c (struct macro_table) : 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) : Update. : Update. * psymtab.h: (psymtab_storage) : Update. Change-Id: I843d5e91f7ccb3db6d1099a8214c15a74510256f --- gdb/macrotab.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gdb/macrotab.h') diff --git a/gdb/macrotab.h b/gdb/macrotab.h index 045d162..83a7dfa 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); -- cgit v1.1