diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0bd3f9e410..8684d81f1f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-20  Joel Brobecker  <brobecker@adacore.com>
+
+	* procfs.c (procfs_address_to_host_pointer): Only define when used.
+
 2010-04-20  Joel Brobecker  <brobecker@adacore.com>
 
 	* procfs.c (iterate_over_mappings_cb_ftype): New typedef.
diff --git a/gdb/procfs.c b/gdb/procfs.c
index 57270fc509..faf840948e 100644
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -2902,10 +2902,11 @@ proc_parent_pid (procinfo *pi)
   return pi->prstatus.pr_ppid;
 }
 
-
 /* Convert a target address (a.k.a. CORE_ADDR) into a host address
    (a.k.a void pointer)!  */
 
+#if (defined (PCWATCH) || defined (PIOCSWATCH)) \
+    && !(defined (PIOCOPENLWP) || defined (UNIXWARE))
 static void *
 procfs_address_to_host_pointer (CORE_ADDR addr)
 {
@@ -2917,6 +2918,7 @@ procfs_address_to_host_pointer (CORE_ADDR addr)
 			      (gdb_byte *) &ptr, addr);
   return ptr;
 }
+#endif
 
 /*
  * Function: proc_set_watchpoint