Merge branch 'martin-olivier:main' into main

martin-olivier · Oct 11, 2023 · 9dd9c30 · 9dd9c30
2 parents 401b933 + 92ab0f3
commit 9dd9c30
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/include/dylib.hpp b/include/dylib.hpp
@@ -23,11 +23,15 @@
 #endif
 
 #if (defined(_WIN32) || defined(_WIN64))
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #undef WIN32_LEAN_AND_MEAN
 #include <Psapi.h>
 #else
+#include <windows.h>
+#endif
+#else
 #include <dlfcn.h>
 #endif
 

diff --git a/tests/tests.cpp b/tests/tests.cpp
@@ -160,9 +160,6 @@ TEST(system_lib, basic_test) {
 #elif defined(__APPLE__)
     dylib lib("ssh2");
     lib.get_function<const char *(int)>("libssh2_version");
-#else
-    dylib lib("pthread");
-    lib.get_function<int()>("pthread_yield");
 #endif
 }