diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e039015b95..5ced3ebe50 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
 2003-01-17  Andrew Cagney  <ac131313@redhat.com>
 
+	* main.c (captured_main): Don't use PTR.
+	* cp-valprint.c (cp_print_class_method): Replace STREQ with strcmp.
+	* gdbtypes.c (lookup_primitive_typename): Ditto.
+	(lookup_struct_elt_type): Ditto.
+	* f-valprint.c (info_common_command): Ditto.
+	(list_all_visible_commons): Ditto.
+	* jv-typeprint.c (java_type_print_base): Ditto.
+
 	* config/djgpp/fnchange.lst: Rename mi1-var-block.exp,
 	mi1-var-child.exp, mi1-var-cmd.exp and mi1-var-display.exp.
 	Rename opcodes/iq2000-desc.c and opcodes/iq2000-dis.c.  Rename
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index f362d84753..a2ccbdbf77 100644
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -130,7 +130,8 @@ cp_print_class_method (char *valaddr,
 	  check_stub_method_group (domain, i);
 	  for (j = 0; j < len2; j++)
 	    {
-	      if (STREQ (SYMBOL_NAME (sym), TYPE_FN_FIELD_PHYSNAME (f, j)))
+	      if (strcmp (SYMBOL_NAME (sym), TYPE_FN_FIELD_PHYSNAME (f, j))
+		  == 0)
 		goto common;
 	    }
 	}
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 1be07e791a..6b4b36dae9 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -562,7 +562,7 @@ list_all_visible_commons (char *funname)
 
   while (tmp != NULL)
     {
-      if (STREQ (tmp->owning_function, funname))
+      if (strcmp (tmp->owning_function, funname) == 0)
 	printf_filtered ("%s\n", tmp->name);
 
       tmp = tmp->next;
@@ -643,7 +643,7 @@ info_common_command (char *comname, int from_tty)
 
   if (the_common)
     {
-      if (STREQ (comname, BLANK_COMMON_NAME_LOCAL))
+      if (strcmp (comname, BLANK_COMMON_NAME_LOCAL) == 0)
 	printf_filtered ("Contents of blank COMMON block:\n");
       else
 	printf_filtered ("Contents of F77 COMMON block '%s':\n", comname);
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 7ef423a240..679822fea7 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -1021,7 +1021,7 @@ lookup_primitive_typename (char *name)
 
   for (p = current_language->la_builtin_type_vector; *p != NULL; p++)
     {
-      if (STREQ (TYPE_NAME (**p), name))
+      if (strcmp (TYPE_NAME (**p), name) == 0)
 	{
 	  return (**p);
 	}
@@ -1228,7 +1228,7 @@ lookup_struct_elt_type (struct type *type, char *name, int noerr)
     char *typename;
 
     typename = type_name_no_tag (type);
-    if (typename != NULL && STREQ (typename, name))
+    if (typename != NULL && strcmp (typename, name) == 0)
       return type;
   }
 #endif
diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c
index 893082cc18..b6dac57d48 100644
--- a/gdb/jv-typeprint.c
+++ b/gdb/jv-typeprint.c
@@ -216,7 +216,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
 	      n_overloads = TYPE_FN_FIELDLIST_LENGTH (type, i);
 	      method_name = TYPE_FN_FIELDLIST_NAME (type, i);
 	      name = type_name_no_tag (type);
-	      is_constructor = name && STREQ (method_name, name);
+	      is_constructor = name && strcmp (method_name, name) == 0;
 
 	      for (j = 0; j < n_overloads; j++)
 		{
diff --git a/gdb/main.c b/gdb/main.c
index 503fd5d026..fb24be935a 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -173,7 +173,7 @@ captured_main (void *data)
 #endif /* MPW */
 
   /* This needs to happen before the first use of malloc.  */
-  init_malloc ((PTR) NULL);
+  init_malloc (NULL);
 
 #if defined (ALIGN_STACK_ON_STARTUP)
   i = (int) &count & 0x3;