From 4f1e0de9a92ae3747daafcb894fab27f8eb50ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 20 Dec 2017 10:22:15 +0100
Subject: [PATCH] Add missing includes. Remove some more unnecessary #ifdef
 _DEBUG checks - the debugger is supposed to work in release mode too.

---
 Core/Core.cpp                            | 4 +---
 Core/HLE/sceSas.cpp                      | 1 +
 Core/Reporting.cpp                       | 2 ++
 Core/System.cpp                          | 2 ++
 UI/RemoteISOScreen.cpp                   | 2 ++
 Windows/InputDevice.cpp                  | 1 +
 ext/native/thread/prioritizedworkqueue.h | 1 +
 7 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/Core/Core.cpp b/Core/Core.cpp
index 352df80c7660..c93cc683c646 100644
--- a/Core/Core.cpp
+++ b/Core/Core.cpp
@@ -213,7 +213,7 @@ void Core_RunLoop(GraphicsContext *ctx) {
 		double diffTime = time_now_d() - startTime;
 		int sleepTime = (int)(1000.0 / 60.0) - (int)(diffTime * 1000.0);
 		if (sleepTime > 0)
-			Sleep(sleepTime);
+			sleep_ms(sleepTime);
 		if (!windowHidden) {
 			ctx->SwapBuffers();
 		}
@@ -292,11 +292,9 @@ void Core_Run(GraphicsContext *ctx) {
 			}
 
 			// wait for step command..
-#if defined(_DEBUG)
 			host->UpdateDisassembly();
 			host->UpdateMemView();
 			host->SendCoreWait(true);
-#endif
 
 			{
 				std::unique_lock<std::mutex> guard(m_hStepMutex);
diff --git a/Core/HLE/sceSas.cpp b/Core/HLE/sceSas.cpp
index c6666beb5501..73409c5eeb05 100644
--- a/Core/HLE/sceSas.cpp
+++ b/Core/HLE/sceSas.cpp
@@ -30,6 +30,7 @@
 #include <functional>
 #include <thread>
 #include <mutex>
+#include <condition_variable>
 
 #include "base/basictypes.h"
 #include "profiler/profiler.h"
diff --git a/Core/Reporting.cpp b/Core/Reporting.cpp
index 930cc8a180e8..7b9e40af036b 100644
--- a/Core/Reporting.cpp
+++ b/Core/Reporting.cpp
@@ -16,6 +16,8 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include <thread>
+#include <mutex>
+#include <condition_variable>
 
 #include "Core/Reporting.h"
 
diff --git a/Core/System.cpp b/Core/System.cpp
index aea38360ea43..0c274f58f267 100644
--- a/Core/System.cpp
+++ b/Core/System.cpp
@@ -24,8 +24,10 @@
 #include <string>
 #include <codecvt>
 #endif
+
 #include <thread>
 #include <mutex>
+#include <condition_variable>
 
 #include "math/math_util.h"
 #include "thread/threadutil.h"
diff --git a/UI/RemoteISOScreen.cpp b/UI/RemoteISOScreen.cpp
index 638a93a0dbd3..0ae4fec31c59 100644
--- a/UI/RemoteISOScreen.cpp
+++ b/UI/RemoteISOScreen.cpp
@@ -17,6 +17,8 @@
 
 #include <algorithm>
 #include <thread>
+#include <mutex>
+#include <condition_variable>
 
 #include "base/timeutil.h"
 #include "ext/vjson/json.h"
diff --git a/Windows/InputDevice.cpp b/Windows/InputDevice.cpp
index 6cdfe36eff07..252d7ee94cc5 100644
--- a/Windows/InputDevice.cpp
+++ b/Windows/InputDevice.cpp
@@ -19,6 +19,7 @@
 #include <thread>
 #include <memory>
 #include <mutex>
+#include <condition_variable>
 
 #include "input/input_state.h"
 #include "thread/threadutil.h"
diff --git a/ext/native/thread/prioritizedworkqueue.h b/ext/native/thread/prioritizedworkqueue.h
index d7c9ad5f7164..032e6a9694e2 100644
--- a/ext/native/thread/prioritizedworkqueue.h
+++ b/ext/native/thread/prioritizedworkqueue.h
@@ -3,6 +3,7 @@
 #include <vector>
 #include <limits>
 #include <mutex>
+#include <condition_variable>
 
 #include "base/basictypes.h"
 #include "thread/threadutil.h"