From: Roland McGrath <roland@redhat.com>
Date: Mon, 1 Mar 2004 21:31:02 +0000 (+0000)
Subject: 2004-03-01  Roland McGrath  <roland@redhat.com>
X-Git-Tag: v4.5.18~628
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b0acdfdbdc95d2eac977f6feadbe3f0ec76ae41a;p=strace

2004-03-01  Roland McGrath  <roland@redhat.com>

	* configure.ac: Check for `struct pt_all_user_regs'
	and `struct ia64_fpreg' in <sys/ptrace.h>.
	* util.c, process.c, syscall.c, signal.c: Work around conflicts between
	<sys/ptrace.h> and <linux/ptrace.h> for defining those types.
---

diff --git a/signal.c b/signal.c
index 0dbc3e9f..422bebb4 100644
--- a/signal.c
+++ b/signal.c
@@ -53,7 +53,15 @@
 #endif
 #elif defined(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
 #include <linux/ptrace.h>
+# undef ia64_fpreg
+# undef pt_all_user_regs
 #endif