commit fadf379b8e3618585cecad447867af27930ac5e3
author Dmitry V. Levin <ldv@altlinux.org> Fri Feb 13 00:26:38 2015 +0000
committer Dmitry V. Levin <ldv@altlinux.org> Fri Feb 13 18:27:58 2015 +0000
tree 7f4daf65cea8a6d86e5c0c31652180ff2a40f18d
parent d8b3404555b9a324610d0caaa0b9237f14605818

Move all ptrace-related macros and declarations from defs.h to ptrace.h

* ptrace.h: New file.
* Makefile.am (strace_SOURCES): Add it.
* configure.ac (AC_CHECK_HEADERS): Remove linux/ptrace.h and sys/ptrace.h.
* defs.h: Do not include <sys/ptrace.h> and <asm/ptrace.h>.
Remove definitions of PTRACE_* macros.
* process.c: Remove <linux/ptrace.h> workarounds, include "ptrace.h".
* signal.c: Likewise.
* syscall.c: Likewise.
* util.c: Likewise.
* strace.c: Include "ptrace.h".
* wait.c: Likewise.

signal.c

diff --git a/signal.c b/signal.c
index 6dd2469..8fd91b6 100644
--- a/signal.c
+++ b/signal.c
@@ -32,29 +32,14 @@
  */
 
 #include "defs.h"
-#include <sys/user.h>
 #include <fcntl.h>
+#include <sys/user.h>
 
 #ifdef HAVE_SYS_REG_H
 # include <sys/reg.h>
 #endif
 
-#ifdef HAVE_LINUX_PTRACE_H
-# undef PTRACE_SYSCALL
-# ifdef HAVE_STRUCT_IA64_FPREG
-#  define ia64_fpreg XXX_ia64_fpreg
-# endif
-# ifdef HAVE_STRUCT_PT_ALL_USER_REGS
-#  define pt_all_user_regs XXX_pt_all_user_regs
-# endif
-# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
-#  define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
-# endif
-# include <linux/ptrace.h>
-# undef ptrace_peeksiginfo_args
-# undef ia64_fpreg
-# undef pt_all_user_regs
-#endif
+#include "ptrace.h"
 
 #ifdef IA64
 # include <asm/ptrace_offsets.h>