From b27397a7d2d665bc88a0c4b763e00cbb5812a28b Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Tue, 12 Jun 2018 12:27:22 +0000
Subject: [PATCH] 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.
---
 Makefile.am          | 1 +
 linux/linux/signal.h | 5 +++++
 2 files changed, 6 insertions(+)
 create mode 100644 linux/linux/signal.h

diff --git a/Makefile.am b/Makefile.am
index 76895517..fbace4a5 100644
--- 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
index 00000000..44e7ea39
--- /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>
-- 
2.50.0