From: Maarten ter Huurne <maarten@treewalker.org>
Date: Sun, 19 Oct 2014 23:02:48 +0000 (+0200)
Subject: Include <linux/ptrace.h> regardless of <sys/reg.h> existence
X-Git-Tag: v4.10~377
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=40c174b38b15adb059f3e855e24fcfea9e091a87;p=strace

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>
---

diff --git a/signal.c b/signal.c
index 5855d136..6f00fc0e 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
diff --git a/syscall.c b/syscall.c
index e74881d5..135221bb 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
diff --git a/util.c b/util.c
index 4e62a8aa..b13f3dc6 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