[PATCH] Work around conflict between <{sys,linux}/ptrace.h>

[Dmitry V. Levin]

On Tue, Sep 24, 2013 at 08:04:32PM +0300, Ali Polatel wrote:
[...]
> diff --git a/signal.c b/signal.c
> index 7fb9abf..569a0fd 100644
> --- a/signal.c
> +++ b/signal.c
> @@ -51,6 +51,10 @@
>  # ifdef HAVE_STRUCT_PT_ALL_USER_REGS
>  #  define pt_all_user_regs XXX_pt_all_user_regs
>  # endif
> +# ifdef HAVE_STRUCT_PTRACE_PEEKSIGINFO_ARGS
> +#  define ptrace_peeksiginfo_args XXX_ptrace_peeksiginfo_args
> +# endif
> +# undef ptrace_peeksiginfo_args
>  # include <linux/ptrace.h>
>  # undef ia64_fpreg
>  # undef pt_all_user_regs

I've corrected this hunk and pushed the fix.  Thanks!


-- 
ldv
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.strace.io/pipermail/strace-devel/attachments/20130926/8384675a/attachment.bin>