Merge 0704f35 into cc12302

RPCS3 · Apr 18, 2017 · 3e8d7b8 · 3e8d7b8
2 parents cc12302 + 0704f35
commit 3e8d7b8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 2 deletions.
diff --git a/Utilities/File.cpp b/Utilities/File.cpp
@@ -6,8 +6,11 @@
 
 #include <unordered_map>
 #include <algorithm>
+#include <cstring>
 #include <cerrno>
 
+using namespace std::literals::string_literals;
+
 #ifdef _WIN32
 
 #include <cwchar>

diff --git a/Utilities/cond.cpp b/Utilities/cond.cpp
@@ -1,6 +1,8 @@
 #include "cond.h"
 #include "sync.h"
 
+#include <limits.h>
+
 #ifndef _WIN32
 #include <thread>
 #endif

diff --git a/Utilities/mutex.cpp b/Utilities/mutex.cpp
@@ -1,6 +1,8 @@
 #include "mutex.h"
 #include "sync.h"
 
+#include <limits.h>
+
 void shared_mutex::imp_lock_shared(s64 _old)
 {
 	verify("shared_mutex overflow" HERE), _old <= c_max;

diff --git a/rpcs3/Crypto/utils.cpp b/rpcs3/Crypto/utils.cpp
@@ -2,8 +2,9 @@
 // Licensed under the terms of the GNU GPL, version 3
 // http://www.gnu.org/licenses/gpl-3.0.txt
 
-#include "utils.h"
-#include <stdio.h>
+#include "utils.h"
+#include <cstring>
+#include <stdio.h>
 #include <time.h>
 
 #include <memory>

diff --git a/rpcs3/Emu/Cell/PPUAnalyser.h b/rpcs3/Emu/Cell/PPUAnalyser.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <string>
 #include <map>
 #include <set>