From dbb5ec84bdf824dc395065342d0725f3dc05bbb8 Mon Sep 17 00:00:00 2001 From: Felix Janda Date: Tue, 26 Sep 2017 18:35:28 -0400 Subject: [PATCH 2/4] Avoid redefinition of ptrace_peeksiginfo_args On glibc defines __ptrace_peeksiginfo_args while defines ptrace_peeksiginfo_args. With musl both define ptrace_peeksiginfo_args causing a collision if both headers are included. Hack around the possible symbol collision. --- headers.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/headers.h b/headers.h index 13e005a..920dcba 100644 --- a/headers.h +++ b/headers.h @@ -144,6 +144,7 @@ # include #endif +#define ptrace_peeksiginfo_args FU_ptrace_peeksiginfo_args #ifdef __ia64__ /* what a pos */ # define ia64_fpreg FU_ia64_fpreg # define pt_all_user_regs FU_pt_all_user_regs @@ -156,6 +157,7 @@ #endif #undef FU_ia64_fpreg #undef FU_pt_all_user_regs +#undef FU_ptrace_peeksiginfo_args #ifdef HAVE_CONFIG_H # include "localdecls.h" -- 2.13.5