aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Marc-Antoine Perennou <Marc-Antoine@Perennou.com> 2013-09-12 17:14:17 +0900
committerAvatar Marc-Antoine Perennou <Marc-Antoine@Perennou.com> 2013-09-12 17:25:33 +0900
commite1aa0310946cd4c36259485d67804fb24fd79278 (patch)
tree4d149c8d584b7be1676bc6ce2d966432138d680d
parent0c29d7d45915d22b1b5a0c3361d8e0a80a81e4b9 (diff)
downloadsydbox-1-e1aa0310946cd4c36259485d67804fb24fd79278.tar.gz
sydbox-1-e1aa0310946cd4c36259485d67804fb24fd79278.tar.xz
fix build with recent glibc/linux-headers
Since glibc 2.18 (http://www.sourceware.org/git/?p=glibc.git;a=commit;h=521c6785e1fc94d1f501743e9a40af9e02797df3) <sys/ptrace.h> defines ptrace_peeksiginfo_args which collieds with <linux/ptrace.h> Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
-rw-r--r--configure.ac5
-rw-r--r--pinktrace/private.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index b9c0302..2e312df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,7 +313,7 @@ AC_SUBST([PINK_HAVE_PROCESS_VM_READV])
AC_SUBST([PINK_HAVE_PROCESS_VM_WRITEV])
dnl check for types
-AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,,[#include <sys/ptrace.h>])
+AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg, struct ptrace_peeksiginfo_args],,,[#include <sys/ptrace.h>])
dnl We need a hack to include linux/ptrace.h after sys/ptrace.h on some systems.
m4_define([include_linux_ptrace_h],
@@ -325,6 +325,9 @@ m4_define([include_linux_ptrace_h],
#define pt_all_user_regs XXX_pt_all_user_regs
#endif
#endif
+ #ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
+ #define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
+ #endif
#include <linux/ptrace.h>
#ifdef __ia64__
#undef ia64_fpreg
diff --git a/pinktrace/private.h b/pinktrace/private.h
index 4a8d5d6..3a2185c 100644
--- a/pinktrace/private.h
+++ b/pinktrace/private.h
@@ -66,6 +66,9 @@
# define pt_all_user_regs XXX_pt_all_user_regs
# endif
#endif
+#ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
+# define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
+#endif
#include <linux/ptrace.h>
#if PINK_ARCH_IA64
# undef ia64_fpreg