From 0ff8d020180a964591a7bf48403fd9f73beaa0be Mon Sep 17 00:00:00 2001
From: keinflue <>
Date: Sun, 2 May 2021 21:19:24 +0000
Subject: [PATCH 1/3] Fix musl include warning.

---
 cli/filelister.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/filelister.cpp b/cli/filelister.cpp
index 016f63bacd4..b1e994a46dd 100644
--- a/cli/filelister.cpp
+++ b/cli/filelister.cpp
@@ -179,7 +179,7 @@ bool FileLister::fileExists(const std::string &path)
 
 #include <dirent.h>
 #include <sys/stat.h>
-#include <sys/errno.h>
+#include <errno.h>
 
 
 static std::string addFiles2(std::map<std::string, std::size_t> &files,

From 72a72e3e8cfd4e66d34b66a8c5d5160bb939bba5 Mon Sep 17 00:00:00 2001
From: keinflue <>
Date: Sun, 2 May 2021 21:20:37 +0000
Subject: [PATCH 2/3] Fix test/cfg errors with musl/libc++.

---
 test/cfg/posix.c | 2 ++
 test/cfg/std.cpp | 1 +
 2 files changed, 3 insertions(+)

diff --git a/test/cfg/posix.c b/test/cfg/posix.c
index c360ab0dbd7..23a0ef44b62 100644
--- a/test/cfg/posix.c
+++ b/test/cfg/posix.c
@@ -12,6 +12,8 @@
 #include <dirent.h>
 #include <sys/mman.h>
 #include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/types.h>
 #include <dlfcn.h>
 #include <fcntl.h>
 // unavailable on some linux systems #include <ndbm.h>
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
index 7c0c97f72fa..bdbf46298f3 100644
--- a/test/cfg/std.cpp
+++ b/test/cfg/std.cpp
@@ -12,6 +12,7 @@
 #include <cstdlib>
 #include <ctime>
 #include <cctype>
+#include <clocale>
 #include <complex>
 #include <cassert>
 #include <cwchar>

From 315d9917b54aad458dca8397310a38ee6368b075 Mon Sep 17 00:00:00 2001
From: keinflue <>
Date: Sun, 2 May 2021 21:45:14 +0000
Subject: [PATCH 3/3] Use correct C++ include for PR #3244

---
 cli/filelister.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/filelister.cpp b/cli/filelister.cpp
index b1e994a46dd..67a0430b95c 100644
--- a/cli/filelister.cpp
+++ b/cli/filelister.cpp
@@ -179,7 +179,7 @@ bool FileLister::fileExists(const std::string &path)
 
 #include <dirent.h>
 #include <sys/stat.h>
-#include <errno.h>
+#include <cerrno>
 
 
 static std::string addFiles2(std::map<std::string, std::size_t> &files,