Patchwork [1/4] Don't declare read_unsigned_leb128 in defs.h

login
register
mail settings
Submitter Tom Tromey
Date May 1, 2019, 6:43 p.m.
Message ID <20190501184402.4030-2-tromey@adacore.com>
Download mbox | patch
Permalink /patch/32477/
State New
Headers show

Comments

Tom Tromey - May 1, 2019, 6:43 p.m.
I noticed that read_unsigned_leb128 is declared in defs.h.  There's no
reason this should be here, so this patch moves it to dwarf2read.h.

gdb/ChangeLog
2019-05-01  Tom Tromey  <tromey@adacore.com>

	* dwarf2loc.c: Include dwarf2read.h.
	* defs.h (read_unsigned_leb128): Don't declare.
	* dwarf2read.h (read_unsigned_leb128): Declare.
---
 gdb/ChangeLog    | 6 ++++++
 gdb/defs.h       | 4 ----
 gdb/dwarf2loc.c  | 1 +
 gdb/dwarf2read.h | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

Patch

diff --git a/gdb/defs.h b/gdb/defs.h
index a44e186907d..673a200d5d0 100644
--- a/gdb/defs.h
+++ b/gdb/defs.h
@@ -582,10 +582,6 @@  extern void copy_integer_to_size (gdb_byte *dest, int dest_size,
 
 extern int watchdog;
 
-/* From dwarf2read.c */
-
-ULONGEST read_unsigned_leb128 (bfd *, const gdb_byte *, unsigned int *);
-
 /* Hooks for alternate command interfaces.  */
 
 /* * The name of the interpreter if specified on the command line.  */
diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c
index bd630ee0588..fd2368c43a9 100644
--- a/gdb/dwarf2loc.c
+++ b/gdb/dwarf2loc.c
@@ -36,6 +36,7 @@ 
 #include "dwarf2.h"
 #include "dwarf2expr.h"
 #include "dwarf2loc.h"
+#include "dwarf2read.h"
 #include "dwarf2-frame.h"
 #include "compile/compile.h"
 #include "common/selftest.h"
diff --git a/gdb/dwarf2read.h b/gdb/dwarf2read.h
index 34c66167b5b..82bf6397ea1 100644
--- a/gdb/dwarf2read.h
+++ b/gdb/dwarf2read.h
@@ -403,4 +403,6 @@  struct signatured_type
 typedef struct signatured_type *sig_type_ptr;
 DEF_VEC_P (sig_type_ptr);
 
+ULONGEST read_unsigned_leb128 (bfd *, const gdb_byte *, unsigned int *);
+
 #endif /* DWARF2READ_H */