diff options
| author | BlockMen <nmuelll@web.de> | 2015-12-11 22:40:37 +0100 |
|---|---|---|
| committer | BlockMen <nmuelll@web.de> | 2015-12-11 23:08:14 +0100 |
| commit | aed10765f208aedf324128972c74ecc033bb5035 (patch) | |
| tree | 6be321006de0a40ae2450bd2ccca3b4af0de580f /src/threading | |
| parent | 6133b2bc4518d0b7cf5836fef0d7317f677bf8e0 (diff) | |
| download | minetest-aed10765f208aedf324128972c74ecc033bb5035.tar.gz minetest-aed10765f208aedf324128972c74ecc033bb5035.tar.bz2 minetest-aed10765f208aedf324128972c74ecc033bb5035.zip | |
Fix events on Windows
Diffstat (limited to 'src/threading')
| -rw-r--r-- | src/threading/event.cpp | 9 | ||||
| -rw-r--r-- | src/threading/event.h | 6 |
2 files changed, 4 insertions, 11 deletions
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 <windows.h> -#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 <condition_variable> #include "threading/mutex.h" #elif defined(_WIN32) - #include <windef.h> + #ifndef WIN32_LEAN_AND_MEAN + #define WIN32_LEAN_AND_MEAN + #endif + #include <windows.h> #else #include <pthread.h> #endif @@ -66,4 +69,3 @@ private: }; #endif - |