Workaround incompatibility between <linux/signal.h> and libc headers

Override <linux/signal.h> with <signal.h> so that those few linux
headers that include <linux/signal.h> could be included along with libc
headers.

* linux/linux/signal.h: New file.
* Makefile.am (strace_SOURCES): Add it.

diff --git a/Makefile.am b/Makefile.am
index 76895517b01a86c12fefeffacf424a987f5d6130..fbace4a57d19b689e8e01237fd8828a1d5983e1b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -182,6 +182,7 @@ strace_SOURCES =    \
        ldt.c           \
        link.c          \
        linux/asm_stat.h \
+       linux/linux/signal.h \
        linux/x32/asm_stat.h \
        linux/x86_64/asm_stat.h \
        listen.c        \

diff --git a/linux/linux/signal.h b/linux/linux/signal.h
new file mode 100644 (file)
index 0000000..44e7ea3
--- /dev/null
+++ b/linux/linux/signal.h
@@ -0,0 +1,5 @@
+/*
+ * Workaround the infamous incompatibility between <linux/signal.h>
+ * and many libc headers by overriding <linux/signal.h> with <signal.h>.
+ */
+#include <signal.h>