diff options
| author | Roland McGrath <roland@redhat.com> | 2009-01-28 22:00:54 -0800 |
|---|---|---|
| committer | Roland McGrath <roland@redhat.com> | 2009-01-28 22:00:54 -0800 |
| commit | 03288f0df65115b75cf029825ecc9cf9158870a4 (patch) | |
| tree | 135d8ad29f522915177d5c6c6817231ff0431606 | |
| parent | c5acb304d81cdbe3f8b923f2a6ac1bee3af9f498 (diff) | |
| download | elfutils-03288f0df65115b75cf029825ecc9cf9158870a4.tar.gz | |
Fiddle internal type decls for C++ scoping.
| -rw-r--r-- | libdw/ChangeLog | 3 | ||||
| -rw-r--r-- | libdw/libdwP.h | 37 |
2 files changed, 22 insertions, 18 deletions
diff --git a/libdw/ChangeLog b/libdw/ChangeLog index c45c1793..d66f34b0 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 1892cd58..1d5a9b27 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 |