Delete old PTRACE_{PEEK,POKE}USR logic

The code base has settled on PTRACE_{PEEK,POKE}USER (with an E) and has
logic in defs.h to make sure it's set sanely.  Delete this old logic as
the defs.h takes care of it now.

* process.c: Delete PTRACE_PEEKUSR/PTRACE_POKEUSR defines.
* signal.c: Likewise.
* syscall.c: Delete PTRACE_PEEKUSR define.
* util.c: Likewise.

diff --git a/process.c b/process.c
index 8b3d2c76b68ba0b4b063a58e9baa5294f454e4c6..5a648a96b1ce5314eb3dd879c16b9e02613e1ef0 100644 (file)
--- a/process.c
+++ b/process.c
@@ -47,12 +47,6 @@
 
 #ifdef HAVE_SYS_REG_H
 # include <sys/reg.h>
-# ifndef PTRACE_PEEKUSR
-#  define PTRACE_PEEKUSR PTRACE_PEEKUSER
-# endif
-# ifndef PTRACE_POKEUSR
-#  define PTRACE_POKEUSR PTRACE_POKEUSER
-# endif
 #endif
 
 #ifdef HAVE_LINUX_PTRACE_H

diff --git a/signal.c b/signal.c
index 3a11b8aa1f6bc9120e14a51f7afabd3976893ee3..a41748e945f2bb424123f166c64784b2fa8e100d 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -37,12 +37,6 @@
 
 #ifdef HAVE_SYS_REG_H
 # include <sys/reg.h>
-# ifndef PTRACE_PEEKUSR
-#  define PTRACE_PEEKUSR PTRACE_PEEKUSER
-# endif
-# ifndef PTRACE_POKEUSR
-#  define PTRACE_POKEUSR PTRACE_POKEUSER
-# endif
 #elif defined(HAVE_LINUX_PTRACE_H)
 # undef PTRACE_SYSCALL
 # ifdef HAVE_STRUCT_IA64_FPREG

diff --git a/syscall.c b/syscall.c
index 3477dcdad7dd3c8f68320ff241459869ad8c4a78..4b6b4eb07213ca32f7f7e469f13398426e6deae4 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -37,9 +37,6 @@
 
 #ifdef HAVE_SYS_REG_H
 # include <sys/reg.h>
-# ifndef PTRACE_PEEKUSR
-#  define PTRACE_PEEKUSR PTRACE_PEEKUSER
-# endif
 #elif defined(HAVE_LINUX_PTRACE_H)
 # undef PTRACE_SYSCALL
 # ifdef HAVE_STRUCT_IA64_FPREG

diff --git a/util.c b/util.c
index 47c8734fab080fdab1b9e4792bee84a8d12c89c9..85bb94c92cd8b642607108d0c8f55a5b42ddb974 100644 (file)
--- a/util.c
+++ b/util.c
@@ -46,7 +46,6 @@
 
 #ifdef HAVE_SYS_REG_H
 # include <sys/reg.h>
-# define PTRACE_PEEKUSR PTRACE_PEEKUSER
 #elif defined(HAVE_LINUX_PTRACE_H)
 # undef PTRACE_SYSCALL
 # ifdef HAVE_STRUCT_IA64_FPREG