1 files changed, 2 insertions, 17 deletions
diff --git a/src/threading/event.h b/src/threading/event.h
index 79a99ce1f..458864c82 100644
--- a/src/threading/event.h
+++ b/src/threading/event.h
@@ -28,11 +28,8 @@ DEALINGS IN THE SOFTWARE.
 
 #include "threads.h"
 
-#if USE_CPP11_MUTEX
 #include <condition_variable>
-#include "threading/mutex.h"
 #include "threading/mutex_auto_lock.h"
-#endif
 
 /** A syncronization primitive that will wake up one waiting thread when signaled.
  * Calling @c signal() multiple times before a waiting thread has had a chance
@@ -43,25 +40,13 @@ DEALINGS IN THE SOFTWARE.
 class Event
 {
 public:
-	Event();
-#ifndef USE_CPP11_MUTEX
-	~Event();
-#endif
 	void wait();
 	void signal();
 
 private:
-#if USE_CPP11_MUTEX
 	std::condition_variable cv;
-	Mutex mutex;
-	bool notified;
-#elif USE_WIN_MUTEX
-	HANDLE event;
-#else
-	pthread_cond_t cv;
-	pthread_mutex_t mutex;
-	bool notified;
-#endif
+	std::mutex mutex;
+	bool notified = false;
 };
 
 #endif