From: Roland McGrath <roland@redhat.com>
Date: Thu, 29 Jan 2009 06:00:54 +0000 (-0800)
Subject: Fiddle internal type decls for C++ scoping.
X-Git-Tag: elfutils-0.140~13^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03288f0df65115b75cf029825ecc9cf9158870a4;p=thirdparty%2Felfutils.git

Fiddle internal type decls for C++ scoping.
---

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index c45c17931..d66f34b03 100644
--- 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 1892cd58f..1d5a9b27f 100644
--- 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