From 6b8029633f323ca892ab074e06f9da9c1de3d0ff Mon Sep 17 00:00:00 2001
From: keinflue <80230456+keinflue@users.noreply.github.com>
Date: Mon, 3 May 2021 07:39:33 +0000
Subject: [PATCH] Fix build warnings and checkcfg errors with musl and libc++.
 (#3244)

* Fix musl include warning.

* Fix test/cfg errors with musl/libc++.

* Use correct C++ include for PR #3244

Co-authored-by: keinflue <>
---
 cli/filelister.cpp | 2 +-
 test/cfg/posix.c   | 2 ++
 test/cfg/std.cpp   | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cli/filelister.cpp b/cli/filelister.cpp
index 016f63bac..67a0430b9 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 <cerrno>
 
 
 static std::string addFiles2(std::map<std::string, std::size_t> &files,
diff --git a/test/cfg/posix.c b/test/cfg/posix.c
index c360ab0db..23a0ef44b 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 7c0c97f72..bdbf46298 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>