* target.h (target_stopped_data_address_p): Delete declaration,

	and don't define as macro.
	* target.c (target_stopped_data_address_p): Delete.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e9106790063a93b7ccbf3ffa59e1ee6102ee15cb..a57e5d7ee8bf80a165d374606cf823cf3594291e 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-05  Pedro Alves  <pedro@codesourcery.com>
+
+       * target.h (target_stopped_data_address_p): Delete declaration,
+       and don't define as macro.
+       * target.c (target_stopped_data_address_p): Delete.
+
 2009-02-05  Thiago Jung Bauermann  <bauerman@br.ibm.com>
            Tom Tromey  <tromey@redhat.com>
 

diff --git a/gdb/target.c b/gdb/target.c
index a289e896f798849985b1425249923a08e8b55e4b..d788c2675c2509df45bd8a9ed320650ce2474583 100644 (file)
--- a/gdb/target.c
+++ b/gdb/target.c
@@ -1353,21 +1353,6 @@ target_flash_done (void)
   tcomplain ();
 }
 
-#ifndef target_stopped_data_address_p
-int
-target_stopped_data_address_p (struct target_ops *target)
-{
-  if (target->to_stopped_data_address
-      == (int (*) (struct target_ops *, CORE_ADDR *)) return_zero)
-    return 0;
-  if (target->to_stopped_data_address == debug_to_stopped_data_address
-      && (debug_target.to_stopped_data_address
-         == (int (*) (struct target_ops *, CORE_ADDR *)) return_zero))
-    return 0;
-  return 1;
-}
-#endif
-
 static void
 show_trust_readonly (struct ui_file *file, int from_tty,
                     struct cmd_list_element *c, const char *value)

diff --git a/gdb/target.h b/gdb/target.h
index 5b5fa5e392de8b7a09a7a47fc8f2d53e3928c299..8e0f6c5436ed8c9dc499a9d5f60f68c3a7d95fca 100644 (file)
--- a/gdb/target.h
+++ b/gdb/target.h
@@ -1129,14 +1129,9 @@ extern char *normal_pid_to_str (ptid_t ptid);
      (*current_target.to_remove_hw_breakpoint) (bp_tgt)
 #endif
 
-extern int target_stopped_data_address_p (struct target_ops *);
-
 #ifndef target_stopped_data_address
 #define target_stopped_data_address(target, x) \
     (*target.to_stopped_data_address) (target, x)
-#else
-/* Horrible hack to get around existing macros :-(.  */
-#define target_stopped_data_address_p(CURRENT_TARGET) (1)
 #endif
 
 #define target_watchpoint_addr_within_range(target, addr, start, length) \