Fiddle internal type decls for C++ scoping.

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index c45c17931c6cc4bd6da13d73537e590fed95e42d..d66f34b0305614a3a8bbe3ce9ae5addcf96d175e 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,5 +1,8 @@
 2009-01-28  Roland McGrath  <roland@redhat.com>
 
+       * libdwP.h (struct Dwarf_Line_s): Move out of struct Dwarf_Lines_s
+       defn so C++ doesn't scope the name to not match the Dwarf_Line typedef.
+
        * libdwP.h (struct Dwarf_Files_s): Replace dbg field with cu field.
 
 2009-01-26  Roland McGrath  <roland@redhat.com>

diff --git a/libdw/libdwP.h b/libdw/libdwP.h
index 1892cd58f20c48e03433a6446f26783ec79b76cc..1d5a9b27f2bbcbcdb32ebe8f49dbfedc8c59871f 100644 (file)
--- a/libdw/libdwP.h
+++ b/libdw/libdwP.h
@@ -223,26 +223,27 @@ typedef struct Dwarf_Fileinfo_s Dwarf_Fileinfo;
 
 
 /* Representation of a row in the line table.  */
-struct Dwarf_Lines_s
-  {
-    size_t nlines;
 
-    struct Dwarf_Line_s
-    {
-      Dwarf_Addr addr;
-      unsigned int file;
-      int line;
-      unsigned short int column;
-      unsigned int is_stmt:1;
-      unsigned int basic_block:1;
-      unsigned int end_sequence:1;
-      unsigned int prologue_end:1;
-      unsigned int epilogue_begin:1;
-
-      Dwarf_Files *files;
-    } info[0];
-  };
+struct Dwarf_Line_s
+{
+  Dwarf_Addr addr;
+  unsigned int file;
+  int line;
+  unsigned short int column;
+  unsigned int is_stmt:1;
+  unsigned int basic_block:1;
+  unsigned int end_sequence:1;
+  unsigned int prologue_end:1;
+  unsigned int epilogue_begin:1;
 
+  Dwarf_Files *files;
+};
+
+struct Dwarf_Lines_s
+{
+  size_t nlines;
+  struct Dwarf_Line_s info[0];
+};
 
 /* Representation of address ranges.  */
 struct Dwarf_Aranges_s