From aed10765f208aedf324128972c74ecc033bb5035 Mon Sep 17 00:00:00 2001 From: BlockMen Date: Fri, 11 Dec 2015 22:40:37 +0100 Subject: Fix events on Windows --- src/threading/event.cpp | 9 --------- src/threading/event.h | 6 ++++-- 2 files changed, 4 insertions(+), 11 deletions(-) (limited to 'src/threading') diff --git a/src/threading/event.cpp b/src/threading/event.cpp index 1c458bf1d..c3c2ca029 100644 --- a/src/threading/event.cpp +++ b/src/threading/event.cpp @@ -25,14 +25,6 @@ DEALINGS IN THE SOFTWARE. #include "threading/event.h" -#if defined(_WIN32) - #ifndef WIN32_LEAN_AND_MEAN - #define WIN32_LEAN_AND_MEAN - #endif - #include -#endif - - #if __cplusplus < 201103L Event::Event() { @@ -92,4 +84,3 @@ void Event::signal() pthread_mutex_unlock(&mutex); #endif } - diff --git a/src/threading/event.h b/src/threading/event.h index ea087e53f..dba3ddb4c 100644 --- a/src/threading/event.h +++ b/src/threading/event.h @@ -30,7 +30,10 @@ DEALINGS IN THE SOFTWARE. #include #include "threading/mutex.h" #elif defined(_WIN32) - #include + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include #else #include #endif @@ -66,4 +69,3 @@ private: }; #endif - -- cgit v1.2.3