diff options
| author | Adam Fedor <fedor@gnu.org> | 2003-02-21 03:00:27 +0000 |
|---|---|---|
| committer | Adam Fedor <fedor@gnu.org> | 2003-02-21 03:00:27 +0000 |
| commit | 5784d15e43727824b660b3b26c3b51b45caab148 (patch) | |
| tree | c1837647f82144e67c4ca966e5bafcb874de461d | |
| parent | d4cad8db8c3e700898454d5b67276378955e4bec (diff) | |
| download | gdb-5784d15e43727824b660b3b26c3b51b45caab148.zip gdb-5784d15e43727824b660b3b26c3b51b45caab148.tar.gz gdb-5784d15e43727824b660b3b26c3b51b45caab148.tar.bz2 | |
* symtab.h: Remove objc_specific struct
(SYMBOL_OBJC_DEMANGLED_NAME): Remove.
* symtab.c (symbol_init_language_specific, symbol_demangled_name):
Have language_objc use cplus_specific struct.
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/symtab.c | 13 | ||||
| -rw-r--r-- | gdb/symtab.h | 8 |
3 files changed, 11 insertions, 17 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ee6a0bc..3020fe3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2003-02-20 Adam Fedor <fedor@gnu.org> + + * symtab.h: Remove objc_specific struct + (SYMBOL_OBJC_DEMANGLED_NAME): Remove. + * symtab.c (symbol_init_language_specific, symbol_demangled_name): + Have language_objc use cplus_specific struct. + 2003-02-20 Tom Tromey <tromey@redhat.com> * jv-valprint.c (java_value_print): Look at TYPE_TAG_NAME, not diff --git a/gdb/symtab.c b/gdb/symtab.c index 9ee05e5..cc31beb 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -413,14 +413,11 @@ symbol_init_language_specific (struct general_symbol_info *gsymbol, { gsymbol->language = language; if (gsymbol->language == language_cplus - || gsymbol->language == language_java) + || gsymbol->language == language_java + || gsymbol->language == language_objc) { gsymbol->language_specific.cplus_specific.demangled_name = NULL; } - else if (gsymbol->language == language_objc) - { - gsymbol->language_specific.objc_specific.demangled_name = NULL; - } else { memset (&gsymbol->language_specific, 0, @@ -584,12 +581,10 @@ char * symbol_demangled_name (struct general_symbol_info *gsymbol) { if (gsymbol->language == language_cplus - || gsymbol->language == language_java) + || gsymbol->language == language_java + || gsymbol->language == language_objc) return gsymbol->language_specific.cplus_specific.demangled_name; - else if (gsymbol->language == language_objc) - return gsymbol->language_specific.objc_specific.demangled_name; - else return NULL; } diff --git a/gdb/symtab.h b/gdb/symtab.h index 6be4798..3bde09f 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -94,11 +94,6 @@ struct general_symbol_info char *demangled_name; } cplus_specific; - struct objc_specific - { - char *demangled_name; - } - objc_specific; } language_specific; @@ -169,9 +164,6 @@ extern void symbol_set_names (struct general_symbol_info *symbol, (symbol_demangled_name (&(symbol)->ginfo)) extern char *symbol_demangled_name (struct general_symbol_info *symbol); -#define SYMBOL_OBJC_DEMANGLED_NAME(symbol) \ - (symbol)->ginfo.language_specific.objc_specific.demangled_name - /* Macro that returns a version of the name of a symbol that is suitable for output. In C++ this is the "demangled" form of the name if demangle is on and the "mangled" form of the name if |