From 67a2b77effae04a5f6c050fd191149c26deb8a82 Mon Sep 17 00:00:00 2001
From: Andrew Cagney <cagney@redhat.com>
Date: Wed, 10 Apr 2002 22:00:20 +0000
Subject: [PATCH] * maint.c (maint_print_section_info): Rename
 print_section_info. (print_bfd_section_info, print_objfile_section_info):
 Update. * inferior.h (struct gdbarch): Add opaque declaration. * gdbarch.sh:
 Add include of "inferior.h" to gdbarch.sh. * gdbarch.h: Regenerate.

---
 gdb/ChangeLog  |  8 ++++++++
 gdb/gdbarch.h  |  2 ++
 gdb/gdbarch.sh |  2 ++
 gdb/inferior.h |  2 ++
 gdb/maint.c    | 10 +++++-----
 5 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7b9252c2160..a216d7d7603 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-10  Andrew Cagney  <ac131313@redhat.com>
+
+	* maint.c (maint_print_section_info): Rename print_section_info.
+	(print_bfd_section_info, print_objfile_section_info): Update.
+	* inferior.h (struct gdbarch): Add opaque declaration.
+	* gdbarch.sh: Add include of "inferior.h" to gdbarch.sh.
+	* gdbarch.h: Regenerate.
+
 2002-04-10  Michal Ludvig  <mludvig@suse.cz>
 
 	* x86-64-linux-nat.c (child_resume, child_xfer_memory): Delete.
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index f68584df63a..ada28e3a8ad 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -37,7 +37,9 @@
 
 #include "dis-asm.h" /* Get defs for disassemble_info, which unfortunately is a typedef. */
 #if !GDB_MULTI_ARCH
+/* Pull in function declarations refered to, indirectly, via macros.  */
 #include "value.h" /* For default_coerce_float_to_double which is referenced by a macro.  */
+#include "inferior.h"		/* For unsigned_address_to_pointer().  */
 #endif
 
 struct frame_info;
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index 645ca238e2e..30641d67c32 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -726,7 +726,9 @@ cat <<EOF
 
 #include "dis-asm.h" /* Get defs for disassemble_info, which unfortunately is a typedef. */
 #if !GDB_MULTI_ARCH
+/* Pull in function declarations refered to, indirectly, via macros.  */
 #include "value.h" /* For default_coerce_float_to_double which is referenced by a macro.  */
+#include "inferior.h"		/* For unsigned_address_to_pointer().  */
 #endif
 
 struct frame_info;
diff --git a/gdb/inferior.h b/gdb/inferior.h
index 3a8161c91ff..c0f100d0838 100644
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -23,6 +23,8 @@
 #if !defined (INFERIOR_H)
 #define INFERIOR_H 1
 
+struct gdbarch;
+
 /* For bpstat.  */
 #include "breakpoint.h"
 
diff --git a/gdb/maint.c b/gdb/maint.c
index aaa3c68d1d6..ddaa390b683 100644
--- a/gdb/maint.c
+++ b/gdb/maint.c
@@ -291,9 +291,9 @@ print_bfd_flags (flagword flags)
 }
 
 static void
-print_section_info (const char *name, flagword flags, 
-		    CORE_ADDR addr, CORE_ADDR endaddr, 
-		    unsigned long filepos)
+maint_print_section_info (const char *name, flagword flags, 
+			  CORE_ADDR addr, CORE_ADDR endaddr, 
+			  unsigned long filepos)
 {
   /* FIXME-32x64: Need print_address_numeric with field width.  */
   printf_filtered ("    0x%s", paddr (addr));
@@ -321,7 +321,7 @@ print_bfd_section_info (bfd *abfd,
 
       addr = bfd_section_vma (abfd, asect);
       endaddr = addr + bfd_section_size (abfd, asect);
-      print_section_info (name, flags, addr, endaddr, asect->filepos);
+      maint_print_section_info (name, flags, addr, endaddr, asect->filepos);
     }
 }
 
@@ -337,7 +337,7 @@ print_objfile_section_info (bfd *abfd,
       || match_substring (string, name)
       || match_bfd_flags (string, flags))
     {
-      print_section_info (name, flags, asect->addr, asect->endaddr, 
+      maint_print_section_info (name, flags, asect->addr, asect->endaddr, 
 			  asect->the_bfd_section->filepos);
     }
 }
-- 
2.30.2