minenux
/
minetest-engine-minecheat
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Fix events on Windows

stable-0.4
BlockMen 2015-12-11 22:40:37 +01:00
parent 6133b2bc45
commit aed10765f2
2 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/threading/event.cpp
View File

@ -25,14 +25,6 @@ DEALINGS IN THE SOFTWARE.
#include "threading/event.h" #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 #if __cplusplus < 201103L
Event::Event() Event::Event()
{ {
@ -92,4 +84,3 @@ void Event::signal()
pthread_mutex_unlock(&mutex); pthread_mutex_unlock(&mutex);
#endif #endif
} }

6
src/threading/event.h
View File

@ -30,7 +30,10 @@ DEALINGS IN THE SOFTWARE.
#include <condition_variable> #include <condition_variable>
#include "threading/mutex.h" #include "threading/mutex.h"
#elif defined(_WIN32) #elif defined(_WIN32)
#include <windef.h> #ifndef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#endif
#include <windows.h>
#else #else
#include <pthread.h> #include <pthread.h>
#endif #endif
@ -66,4 +69,3 @@ private:
}; };
#endif #endif