* dwarf2read.c (dwarf2_add_member_fn, read_structure_scope):

Replace uses of DEPRECATED_STREQ and DEPRECATED_STREQN with calls
to strcmp and strncmp.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index dd15edc..179bffb 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2003-12-13  Jim Blandy  <jimb@redhat.com>
 
+       * dwarf2read.c (dwarf2_add_member_fn, read_structure_scope):
+       Replace uses of DEPRECATED_STREQ and DEPRECATED_STREQN with calls
+       to strcmp and strncmp.
+
        * osabi.c (gdbarch_init_osabi): Reformat error message with better
        line breaks.
 

diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index b151d60..bf2a57e 100644 (file)
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -2604,7 +2604,7 @@ dwarf2_add_member_fn (struct field_info *fip, struct die_info *die,
   /* Look up member function name in fieldlist.  */
   for (i = 0; i < fip->nfnfields; i++)
     {
-      if (DEPRECATED_STREQ (fip->fnfieldlists[i].name, fieldname))
+      if (strcmp (fip->fnfieldlists[i].name, fieldname) == 0)
        break;
     }
 
@@ -2883,7 +2883,9 @@ read_structure_scope (struct die_info *die, struct dwarf2_cu *cu)
                    {
                      char *fieldname = TYPE_FIELD_NAME (t, i);
 
-                     if (DEPRECATED_STREQN (fieldname, vptr_name, strlen (vptr_name) - 1)
+                     if ((strncmp (fieldname, vptr_name,
+                                    strlen (vptr_name) - 1)
+                           == 0)
                          && is_cplus_marker (fieldname[strlen (vptr_name)]))
                        {
                          TYPE_VPTR_FIELDNO (type) = i;