From: Roland McGrath <roland@redhat.com>
Date: Mon, 1 Mar 2004 21:29:22 +0000 (+0000)
Subject: 2004-03-01  Roland McGrath  <roland@redhat.com>
X-Git-Tag: v4.5.18~631
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce9f0740d3b6e9910f25712771961bdb4bb4eaa2;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: Work around conflicts between
	<sys/ptrace.h> and <linux/ptrace.h> for defining those types.
---

diff --git a/configure.ac b/configure.ac
index a60b61f7..b7cd49ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -207,6 +207,9 @@ AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr,
 
 AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include <asm/stat.h>])
 
+AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,,
+	       [#include <sys/ptrace.h>])
+
 AC_CHECK_DECLS([sys_errlist])
 AC_CHECK_DECLS([sys_siglist, _sys_siglist],,, [#include <signal.h>])
 
diff --git a/syscall.c b/syscall.c
index 214e38bb..87f7a829 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)
diff --git a/util.c b/util.c
index 5a85c0b7..2770ac45 100644
--- a/util.c
+++ b/util.c
@@ -63,7 +63,15 @@
 # define PTRACE_PEEKUSR PTRACE_PEEKUSER
 #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
 
 #ifdef SUNOS4_KERNEL_ARCH_KLUDGE