commit ce9f0740d3b6e9910f25712771961bdb4bb4eaa2
author Roland McGrath <roland@redhat.com> Mon Mar 01 21:29:22 2004 +0000
committer Roland McGrath <roland@redhat.com> Mon Mar 01 21:29:22 2004 +0000
tree 85c2ce1f431e6ad382369319a0df7aef98aa069b
parent 90d0afd72811fa149d66b9c6b59d0ebcbf9aba6b

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: Work around conflicts between
	<sys/ptrace.h> and <linux/ptrace.h> for defining those types.

syscall.c

diff --git a/syscall.c b/syscall.c
index 214e38b..87f7a82 100644
--- a/syscall.c
+++ b/syscall.c
@@ -63,7 +63,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
 
 #if defined(LINUX) && defined(IA64)