Module Name: src
Committed By: martin
Date: Thu Dec 15 20:04:36 UTC 2016
Modified Files:
src/sys/sys: ptrace.h
Log Message:
Simplify #ifdefs so this compiles on architectures that do not support
watchpoints.
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/sys/ptrace.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/ptrace.h
diff -u src/sys/sys/ptrace.h:1.50 src/sys/sys/ptrace.h:1.51
--- src/sys/sys/ptrace.h:1.50 Thu Dec 15 12:04:18 2016
+++ src/sys/sys/ptrace.h Thu Dec 15 20:04:36 2016
@@ -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 @@ struct ptrace_lwpinfo {
#define PL_EVENT_NONE 0
#define PL_EVENT_SIGNAL 1
-#ifdef __HAVE_PTRACE_WATCHPOINTS
/*
* Hardware Watchpoints
*
@@ -127,9 +126,10 @@ struct ptrace_lwpinfo {
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 */
-} ptrace_watchpoint_t;
#endif
+} ptrace_watchpoint_t;
#ifdef _KERNEL
@@ -264,10 +264,8 @@ int process_write_watchpoint(struct lwp
#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)
