* target.h (target_pid_or_tid_to_str): Remove.

	* infrun.c (handle_inferior_event):
        Use target_pid_to_str instead of
	target_pid_or_tid_to_str.
	(normal_stop): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6a201bd7bce0b6e1799a292c89e75546f289f199..029292faae5d99768f66fac71d55051c376cf4e3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-16  Vladimir Prus  <vladimir@codesourcery.com>
+
+       * target.h (target_pid_or_tid_to_str): Remove.
+       * infrun.c (handle_inferior_event):
+        Use target_pid_to_str instead of 
+       target_pid_or_tid_to_str.
+       (normal_stop): Likewise.
+
 2007-12-16  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * dwarf2read.c (dwarf_attr_name): Rename `DW_AT_stride_size' to its

diff --git a/gdb/infrun.c b/gdb/infrun.c
index 44a18ad02f8bcea6f0e67655c798fdd3e57b65a2..9c9b94d44b964a71ebc9262787219ccfe8737f4e 100644 (file)
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -1335,7 +1335,7 @@ handle_inferior_event (struct execution_control_state *ecs)
       add_thread (ecs->ptid);
 
       ui_out_text (uiout, "[New ");
-      ui_out_text (uiout, target_pid_or_tid_to_str (ecs->ptid));
+      ui_out_text (uiout, target_pid_to_str (ecs->ptid));
       ui_out_text (uiout, "]\n");
     }
 
@@ -3157,7 +3157,7 @@ normal_stop (void)
     {
       target_terminal_ours_for_output ();
       printf_filtered (_("[Switching to %s]\n"),
-                      target_pid_or_tid_to_str (inferior_ptid));
+                      target_pid_to_str (inferior_ptid));
       previous_inferior_ptid = inferior_ptid;
     }
 

diff --git a/gdb/target.h b/gdb/target.h
index 10fe04b9fbb33af68f3547b46a1218c2365bd6d0..ec5f86dddb10357e4dd487e01f3ca5551ea9a66c 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -991,11 +991,6 @@ extern char *normal_pid_to_str (ptid_t ptid);
 #define target_extra_thread_info(TP) \
      (current_target.to_extra_thread_info (TP))
 
-#ifndef target_pid_or_tid_to_str
-#define target_pid_or_tid_to_str(ID) \
-     target_pid_to_str (ID)
-#endif
-
 /* Attempts to find the pathname of the executable file
    that was run to create a specified process.