From: Roland McGrath <roland@redhat.com>
Date: Thu, 29 Jan 2009 06:01:38 +0000 (-0800)
Subject: Merge commit 'origin/master' into dwarf
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4138faff4cb4aedf3c559059d9da17414f87f51c;p=thirdparty%2Felfutils.git

Merge commit 'origin/master' into dwarf
---

4138faff4cb4aedf3c559059d9da17414f87f51c
diff --cc libdw/ChangeLog
index da396cafc,d66f34b03..06ff0290f
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@@ -1,18 -1,10 +1,21 @@@
  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>
 +
 +	* c++/dwarf (dwarf_output): Renamed to dwarf_edit and moved to ...
 +	* c++/dwarf_edit: ... here.  New file.
 +	* Makefile.am (pkginclude_HEADERS): Add it.
 +
 +2009-01-10  Roland McGrath  <roland@redhat.com>
 +
 +	* c++/dwarf: New file.
 +	* Makefile.am (pkginclude_HEADERS): Add it.
 +
  2009-01-26  Roland McGrath  <roland@redhat.com>
  
  	* dwarf_ranges.c: Return 0 when no ranges or *_pc attrs at all.