Merge pull request #3934 from solemnwarning/fix-build

Fix build using clang/libc++/winpthread on Windows.
randombit · Mar 19, 2024 · 00a92b6 · 00a92b6
2 parents 8c5e9c3 + c6165a5
commit 00a92b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/lib/utils/os_utils.cpp b/src/lib/utils/os_utils.cpp
@@ -638,6 +638,8 @@ void OS::set_thread_name(std::thread& thread, const std::string& name) {
    static_cast<void>(pthread_set_name_np(thread.native_handle(), name.c_str()));
    #elif defined(BOTAN_TARGET_OS_IS_NETBSD)
    static_cast<void>(pthread_setname_np(thread.native_handle(), "%s", const_cast<char*>(name.c_str())));
+   #elif defined(BOTAN_TARGET_OS_HAS_WIN32) && defined(_LIBCPP_HAS_THREAD_API_PTHREAD)
+   static_cast<void>(pthread_setname_np(thread.native_handle(), name.c_str()));
    #elif defined(BOTAN_TARGET_OS_HAS_WIN32) && defined(BOTAN_BUILD_COMPILER_IS_MSVC)
    typedef HRESULT(WINAPI * std_proc)(HANDLE, PCWSTR);
    HMODULE kern = GetModuleHandleA("KernelBase.dll");

diff --git a/src/tests/tests.h b/src/tests/tests.h
@@ -17,6 +17,7 @@
 #include <map>
 #include <memory>
 #include <optional>
+#include <ranges>
 #include <set>
 #include <sstream>
 #include <string>