Merge tag 'v0.22.7'

release v0.22.7
2021-05-19 18:43:19 +02:00
parent e016cc8940 3547fc7e61
commit 96707c0426
33 changed files with 208 additions and 82 deletions
--- a/src/thread/CriticalSection.hxx
+++ b/src/thread/CriticalSection.hxx
@@ -30,7 +30,7 @@
 #ifndef THREAD_CRITICAL_SECTION_HXX
 #define THREAD_CRITICAL_SECTION_HXX

-#include <windows.h>
+#include <synchapi.h>

 /**
 * Wrapper for a CRITICAL_SECTION, backend for the Mutex class.
--- a/src/thread/Id.hxx
+++ b/src/thread/Id.hxx
@@ -33,7 +33,7 @@
 #include "util/Compiler.h"

 #ifdef _WIN32
-#include <windows.h>
+#include <processthreadsapi.h>
 #else
 #include <pthread.h>
 #endif
--- a/src/thread/Thread.hxx
+++ b/src/thread/Thread.hxx
@@ -26,7 +26,7 @@
 #include <cassert>

 #ifdef _WIN32
-#include <windows.h>
+#include <processthreadsapi.h>
 #else
 #include <pthread.h>
 #endif
--- a/src/thread/WindowsCond.hxx
+++ b/src/thread/WindowsCond.hxx
@@ -32,6 +32,9 @@

 #include "CriticalSection.hxx"

+#include <windef.h> // for HWND (needed by winbase.h)
+#include <winbase.h> // for INFINITE
+
 #include <chrono>
 #include <mutex>