Fix events on Windows

minetest · Dec 11, 2015 · aed1076 · aed1076
1 parent 6133b2b
commit aed1076
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git 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
@@ -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
-