PR 10656

        * readelf.c: Remove duplicate declaration of variable do_wide.
        * dwarf.h: Add export of do_wide.

        * hist.h: Move declaration of histograms and num_histograms
        variables from here to...
        * hist.c: ...here.

1 files changed, 8 insertions, 6 deletions

diff --git a/binutils/dwarf.h b/binutils/dwarf.h
index 5d793ed..b39aba1 100644
--- a/binutils/dwarf.h
+++ b/binutils/dwarf.h
@@ -32,9 +32,9 @@ typedef unsigned long dwarf_size_type;
 struct dwarf_section
 {
   /* A debug section has a different name when it's stored compressed
-   * or not.  COMPRESSED_NAME and UNCOMPRESSED_NAME are the two
-   * possibilities.  NAME is set to whichever one is used for this
-   * input file, as determined by load_debug_section().  */
+     or not.  COMPRESSED_NAME and UNCOMPRESSED_NAME are the two
+     possibilities.  NAME is set to whichever one is used for this
+     input file, as determined by load_debug_section().  */
   const char *uncompressed_name;
   const char *compressed_name;
   const char *name;
@@ -53,7 +53,8 @@ struct dwarf_section_display
   unsigned int relocate : 1;
 };
 
-enum dwarf_section_display_enum {
+enum dwarf_section_display_enum
+{
   abbrev = 0,
   aranges,
   frame,
@@ -111,6 +112,7 @@ extern int do_debug_frames_interp;
 extern int do_debug_macinfo;
 extern int do_debug_str;
 extern int do_debug_loc;
+extern int do_wide;
 
 extern void init_dwarf_regnames (unsigned int);
 
@@ -120,8 +122,8 @@ extern void free_debug_section (enum dwarf_section_display_enum);
 
 extern void free_debug_memory (void);
 
-extern void dwarf_select_sections_by_names (const char *names);
-extern void dwarf_select_sections_by_letters (const char *letters);
+extern void dwarf_select_sections_by_names (const char *);
+extern void dwarf_select_sections_by_letters (const char *);
 extern void dwarf_select_sections_all (void);
 
 void *cmalloc (size_t, size_t);