commit 40c174b38b15adb059f3e855e24fcfea9e091a87
author Maarten ter Huurne <maarten@treewalker.org> Mon Oct 20 01:02:48 2014 +0200
committer Dmitry V. Levin <ldv@altlinux.org> Fri Oct 31 23:04:59 2014 +0000
tree 9a961a9d307f03aa7da6db7b6ad88cfa90a49c6f
parent 788c0d660d91032d6ce4ac646d86b20dc56e11ea

Include <linux/ptrace.h> regardless of <sys/reg.h> existence

This fixes compilation with musl libc.
This approach was already used in process.c, so I assume it is safe.

* signal.c: Move [HAVE_LINUX_PTRACE_H] code out of [HAVE_SYS_REG_H] check.
* syscall.c: Likewise.
* util.c: Likewise.

Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>

signal.c

diff --git a/signal.c b/signal.c
index 5855d13..6f00fc0 100644
--- a/signal.c
+++ b/signal.c
@@ -37,7 +37,9 @@
 
 #ifdef HAVE_SYS_REG_H
 # include <sys/reg.h>
-#elif defined(HAVE_LINUX_PTRACE_H)
+#endif
+
+#ifdef HAVE_LINUX_PTRACE_H
 # undef PTRACE_SYSCALL
 # ifdef HAVE_STRUCT_IA64_FPREG
 #  define ia64_fpreg XXX_ia64_fpreg

syscall.c

diff --git a/syscall.c b/syscall.c
index e74881d..135221b 100644
--- a/syscall.c
+++ b/syscall.c
@@ -37,7 +37,9 @@
 
 #ifdef HAVE_SYS_REG_H
 # include <sys/reg.h>
-#elif defined(HAVE_LINUX_PTRACE_H)
+#endif
+
+#ifdef HAVE_LINUX_PTRACE_H
 # undef PTRACE_SYSCALL
 # ifdef HAVE_STRUCT_IA64_FPREG
 #  define ia64_fpreg XXX_ia64_fpreg

util.c

diff --git a/util.c b/util.c
index 4e62a8a..b13f3dc 100644
--- a/util.c
+++ b/util.c
@@ -46,7 +46,9 @@
 
 #ifdef HAVE_SYS_REG_H
 # include <sys/reg.h>
-#elif defined(HAVE_LINUX_PTRACE_H)
+#endif
+
+#ifdef HAVE_LINUX_PTRACE_H
 # undef PTRACE_SYSCALL
 # ifdef HAVE_STRUCT_IA64_FPREG
 #  define ia64_fpreg XXX_ia64_fpreg