[src/trunk]: src/sys/sys Simplify #ifdefs so this compiles on architectures t...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c70fca3ed981
branches:  trunk
changeset: 349600:c70fca3ed981
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Dec 15 20:04:36 2016 +0000

description:
Simplify #ifdefs so this compiles on architectures that do not support
watchpoints.

diffstat:

 sys/sys/ptrace.h |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (40 lines):

diff -r b0ab5813623b -r c70fca3ed981 sys/sys/ptrace.h
--- a/sys/sys/ptrace.h  Thu Dec 15 17:21:21 2016 +0000
+++ b/sys/sys/ptrace.h  Thu Dec 15 20:04:36 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ptrace.h,v 1.50 2016/12/15 12:04:18 kamil Exp $        */
+/*     $NetBSD: ptrace.h,v 1.51 2016/12/15 20:04:36 martin Exp $       */
 
 /*-
  * Copyright (c) 1984, 1993
@@ -118,7 +118,6 @@
 #define PL_EVENT_NONE  0
 #define PL_EVENT_SIGNAL        1
 
-#ifdef __HAVE_PTRACE_WATCHPOINTS
 /*
  * Hardware Watchpoints
  *
@@ -127,9 +126,10 @@
 typedef struct ptrace_watchpoint {
        int             pw_index;       /* HW Watchpoint ID (count from 0) */
        lwpid_t         pw_lwpid;       /* LWP described */
+#ifdef __HAVE_PTRACE_WATCHPOINTS
        struct mdpw     pw_md;          /* MD fields */
+#endif
 } ptrace_watchpoint_t;
-#endif
 
 #ifdef _KERNEL
 
@@ -264,10 +264,8 @@
 #endif
 #endif
 
-#ifdef __HAVE_PROCFS_MACHDEP
 int    ptrace_machdep_dorequest(struct lwp *, struct lwp *, int,
            void *, int);
-#endif
 
 #ifndef FIX_SSTEP
 #define FIX_SSTEP(p)