Namespace the reg class to avoid clashes with OS headers

[deliverable/binutils-gdb.git] / gdb / regformats / regdef.h

diff --git a/gdb/regformats/regdef.h b/gdb/regformats/regdef.h
index 4775e863e9acc516c0d0ab90baf428604eb967c4..ed9aeb7af4b8232b8c7de1a8ba1c830ab7922b7a 100644 (file)
--- a/gdb/regformats/regdef.h
+++ b/gdb/regformats/regdef.h
@@ -1,5 +1,5 @@
 /* Register protocol definition structures for the GNU Debugger
-   Copyright (C) 2001-2018 Free Software Foundation, Inc.
+   Copyright (C) 2001-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -16,20 +16,22 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef REGDEF_H
-#define REGDEF_H
+#ifndef REGFORMATS_REGDEF_H
+#define REGFORMATS_REGDEF_H
+
+namespace gdb {
 
 struct reg
 {
-  reg ()
+  reg (int _offset)
     : name (""),
-      offset (0),
+      offset (_offset),
       size (0)
   {}
 
-  reg (const char *_name, int _size)
+  reg (const char *_name, int _offset, int _size)
     : name (_name),
-      offset (0),
+      offset (_offset),
       size (_size)
   {}
 
@@ -60,4 +62,6 @@ struct reg
   }
 };
 
-#endif /* REGDEF_H */
+} /* namespace gdb */
+
+#endif /* REGFORMATS_REGDEF_H */