Permalink
Browse files

Fix events on Windows

  • Loading branch information...
1 parent 6133b2b commit aed10765f208aedf324128972c74ecc033bb5035 @BlockMen BlockMen committed Dec 11, 2015
Showing with 4 additions and 11 deletions.
  1. +0 −9 src/threading/event.cpp
  2. +4 −2 src/threading/event.h
View
@@ -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
}
-
View
@@ -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 @@ class Event {
};
#endif
-

0 comments on commit aed1076

Please sign in to comment.