2003-02-17  Adam Fedor  <fedor@gnu.org>

	* symtab.h: Remove objc_specific struct
	* symtab.c (symbol_init_language_specific,
	symbol_init_demangled_name, symbol_demangled_name): Have
	language_objc use cplus_specific struct.

Index: symtab.c
===================================================================
RCS file: /cvs/src/src/gdb/symtab.c,v
retrieving revision 1.87
diff -u -p -r1.87 symtab.c
--- symtab.c	4 Feb 2003 18:07:01 -0000	1.87
+++ symtab.c	18 Feb 2003 03:17:46 -0000
@@ -412,14 +413,11 @@ symbol_init_language_specific (struct ge
 {
   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,
@@ -558,7 +568,8 @@ symbol_init_demangled_name (struct gener
 
   demangled = symbol_find_demangled_name (gsymbol, mangled);
   if (gsymbol->language == language_cplus
-      || gsymbol->language == language_java)
+      || gsymbol->language == language_java
+      || gsymbol->language == language_objc)
     {
       if (demangled)
 	{
@@ -583,12 +594,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;
 }
Index: symtab.h
===================================================================
RCS file: /cvs/src/src/gdb/symtab.h,v
retrieving revision 1.57
diff -u -p -r1.57 symtab.h
--- symtab.h	4 Feb 2003 21:37:03 -0000	1.57
+++ symtab.h	14 Feb 2003 04:24:44 -0000
@@ -90,11 +90,6 @@ struct general_symbol_info
       char *demangled_name;
     }
     cplus_specific;
-    struct objc_specific
-    {
-      char *demangled_name;
-    }
-    objc_specific;
   }
   language_specific;