[PATCH] Namespace the reg class to avoid clashes with OS headers

[PATCH] Namespace the reg class to avoid clashes with OS headers

[Kamil Rytarowski]

Fix build issues on NetBSD where the reg symbol exists in public headers.
---
 gdb/regformats/regdef.h | 4 ++++
 gdbserver/regcache.cc   | 2 +-
 gdbserver/tdesc.cc      | 2 +-
 gdbserver/tdesc.h       | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gdb/regformats/regdef.h b/gdb/regformats/regdef.h
index 340281e2425..ed9aeb7af4b 100644
--- a/gdb/regformats/regdef.h
+++ b/gdb/regformats/regdef.h
@@ -19,6 +19,8 @@
 #ifndef REGFORMATS_REGDEF_H
 #define REGFORMATS_REGDEF_H

+namespace gdb {
+
 struct reg
 {
   reg (int _offset)
@@ -60,4 +62,6 @@ struct reg
   }
 };

+} /* namespace gdb */
+
 #endif /* REGFORMATS_REGDEF_H */
diff --git a/gdbserver/regcache.cc b/gdbserver/regcache.cc
index 33d38879dc6..6c0af95b34e 100644
--- a/gdbserver/regcache.cc
+++ b/gdbserver/regcache.cc
@@ -198,7 +198,7 @@ regcache_cpy (struct regcache *dst, struct regcache *src)

 /* Return a reference to the description of register N.  */

-static const struct reg &
+static const struct gdb::reg &
 find_register_by_number (const struct target_desc *tdesc, int n)
 {
   return tdesc->reg_defs[n];
diff --git a/gdbserver/tdesc.cc b/gdbserver/tdesc.cc
index de25e7cfb46..8d97defb9b5 100644
--- a/gdbserver/tdesc.cc
+++ b/gdbserver/tdesc.cc
@@ -75,7 +75,7 @@ init_target_desc (struct target_desc *tdesc,
 	gdb_assert (regnum == 0 || regnum >= tdesc->reg_defs.size ());

 	if (regnum != 0)
-	  tdesc->reg_defs.resize (regnum, reg (offset));
+	  tdesc->reg_defs.resize (regnum, gdb::reg (offset));

 	tdesc->reg_defs.emplace_back (treg->name.c_str (), offset,
 				      treg->bitsize);
diff --git a/gdbserver/tdesc.h b/gdbserver/tdesc.h
index 5e0df85cea8..f9ca478ff6d 100644
--- a/gdbserver/tdesc.h
+++ b/gdbserver/tdesc.h
@@ -31,7 +31,7 @@ struct target_desc : tdesc_element
 {
   /* A vector of elements of register definitions that
      describe the inferior's register set.  */
-  std::vector<struct reg> reg_defs;
+  std::vector<struct gdb::reg> reg_defs;

   /* The register cache size, in bytes.  */
   int registers_size;
--
2.25.0

Re: [PATCH] Namespace the reg class to avoid clashes with OS headers

[Simon Marchi]

On 2020-03-17 9:56 a.m., Kamil Rytarowski wrote:
> Fix build issues on NetBSD where the reg symbol exists in public headers.

When fixing build issues, please quote the compilation error in the
commit message.  Also, please don't forget the ChangeLog entry.

The patch is ok with those two addressed.

Simon