* procfs.c (procfs_wait): Protect watchpoint code with appropriate

	#ifdefs.
	(procfs_set_watchpoint, procfs_stopped_by_watchpoint): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 70be9129904bf24e1cc041a934955b25ecdada48..0d64b68f32771598d67eba92e7cce830b6781d97 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -2,6 +2,7 @@ Thu Apr 14 07:01:56 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
        * procfs.c (procfs_wait): Protect watchpoint code with appropriate
        #ifdefs.
+       (procfs_set_watchpoint, procfs_stopped_by_watchpoint): Likewise.
 
 Wed Apr 13 14:52:46 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 

diff --git a/gdb/procfs.c b/gdb/procfs.c
index 3d82e230950c4fcc0d8bfc9514ddb83323104678..0a7171be9cb5e231f3bb2206f0868399e4b2b1e8 100644 (file)
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -3538,6 +3538,7 @@ procfs_can_run ()
 {
   return(1);
 }
+#ifdef TARGET_CAN_USE_HARDWARE_WATCHPOINT
 \f
 /* Insert a watchpoint */
 int
@@ -3582,11 +3583,21 @@ procfs_stopped_by_watchpoint(pid)
       why = pi->prstatus.pr_why;
       what = pi->prstatus.pr_what;
       if (why == PR_FAULTED 
-         && (what == FLTWATCH) || (what == FLTKWATCH))
+#if defined (FLTWATCH) && defined (FLTKWATCH)
+         && (what == FLTWATCH) || (what == FLTKWATCH)
+#else
+#ifdef FLTWATCH
+         && (what == FLTWATCH) 
+#endif
+#ifdef FLTKWATCH
+         && (what == FLTKWATCH)
+#endif
+         )
        return what;
     }
   return 0;
 }
+#endif
 
 \f
 struct target_ops procfs_ops = {