From mboxrd@z Thu Jan  1 00:00:00 1970
Received: by passt.top (Postfix, from userid 1000)
	id 4E7405A0270; Wed,  8 Mar 2023 08:35:16 +0100 (CET)
From: Stefano Brivio <sbrivio@redhat.com>
To: passt-dev@passt.top
Subject: [PATCH 3/4] treewide: Fix header includes to build with musl
Date: Wed,  8 Mar 2023 08:35:15 +0100
Message-Id: <20230308073516.2189680-4-sbrivio@redhat.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230308073516.2189680-1-sbrivio@redhat.com>
References: <20230308073516.2189680-1-sbrivio@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Message-ID-Hash: 5CNSNE46ALLN2HICXUYJR6GRR56P7S7S
X-Message-ID-Hash: 5CNSNE46ALLN2HICXUYJR6GRR56P7S7S
X-MailFrom: sbrivio@passt.top
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header
CC: Chris Kuhn <kuhnchris+passt@kuhnchris.eu>, lemmi <lemmi@nerd2nerd.org>
X-Mailman-Version: 3.3.8
Precedence: list
List-Id: Development discussion and patches for passt <passt-dev.passt.top>
Archived-At: <https://archives.passt.top/passt-dev/20230308073516.2189680-4-sbrivio@redhat.com/>
Archived-At: <https://passt.top/hyperkitty/list/passt-dev@passt.top/message/5CNSNE46ALLN2HICXUYJR6GRR56P7S7S/>
List-Archive: <https://archives.passt.top/passt-dev/>
List-Archive: <https://passt.top/hyperkitty/list/passt-dev@passt.top/>
List-Help: <mailto:passt-dev-request@passt.top?subject=help>
List-Owner: <mailto:passt-dev-owner@passt.top>
List-Post: <mailto:passt-dev@passt.top>
List-Subscribe: <mailto:passt-dev-join@passt.top>
List-Unsubscribe: <mailto:passt-dev-leave@passt.top>

From: Chris Kuhn <kuhnchris+github@kuhnchris.eu>

Roughly inspired from a patch by Chris Kuhn: fix up includes so that
we can build against musl: glibc is more lenient as headers generally
include a larger amount of other headers.

Compared to the original patch, I only included what was needed
directly in C files, instead of adding blanket includes in local
header files. It's a bit more involved, but more consistent with the
current (not ideal) situation.

Reported-by: Chris Kuhn <kuhnchris+github@kuhnchris.eu>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
 conf.c       | 2 ++
 isolation.c  | 1 +
 netlink.c    | 1 +
 passt.c      | 2 ++
 tap.c        | 1 +
 tcp.c        | 1 +
 tcp_splice.c | 1 +
 udp.c        | 1 +
 util.c       | 1 +
 9 files changed, 11 insertions(+)

diff --git a/conf.c b/conf.c
index 07b0b7b..582c391 100644
--- a/conf.c
+++ b/conf.c
@@ -23,8 +23,10 @@
 #include <limits.h>
 #include <grp.h>
 #include <pwd.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdbool.h>
 #include <unistd.h>
 #include <syslog.h>
diff --git a/isolation.c b/isolation.c
index 6bae4d4..20dc879 100644
--- a/isolation.c
+++ b/isolation.c
@@ -65,6 +65,7 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
diff --git a/netlink.c b/netlink.c
index 0e0be4f..c8d39a1 100644
--- a/netlink.c
+++ b/netlink.c
@@ -18,6 +18,7 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <limits.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/passt.c b/passt.c
index f67213a..dfec9d4 100644
--- a/passt.c
+++ b/passt.c
@@ -27,6 +27,8 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <netdb.h>
+#include <signal.h>
+#include <stdio.h>
 #include <string.h>
 #include <errno.h>
 #include <time.h>
diff --git a/tap.c b/tap.c
index 88eed88..15fb52e 100644
--- a/tap.c
+++ b/tap.c
@@ -14,6 +14,7 @@
  */
 
 #include <sched.h>
+#include <signal.h>
 #include <stdio.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/tcp.c b/tcp.c
index 8e8d653..96ca5c7 100644
--- a/tcp.c
+++ b/tcp.c
@@ -267,6 +267,7 @@
 #include <sched.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <signal.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/tcp_splice.c b/tcp_splice.c
index 67af46b..6559762 100644
--- a/tcp_splice.c
+++ b/tcp_splice.c
@@ -32,6 +32,7 @@
  */
 
 #include <sched.h>
+#include <signal.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
diff --git a/udp.c b/udp.c
index 99cfc9f..1077cde 100644
--- a/udp.c
+++ b/udp.c
@@ -91,6 +91,7 @@
  */
 
 #include <sched.h>
+#include <signal.h>
 #include <stdio.h>
 #include <errno.h>
 #include <limits.h>
diff --git a/util.c b/util.c
index 799173f..484889b 100644
--- a/util.c
+++ b/util.c
@@ -13,6 +13,7 @@
  */
 
 #include <sched.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <arpa/inet.h>
-- 
2.39.2