From c3016fe6a506ef1a8fff8f6e01f32b37ec999241 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= <hrydgard@gmail.com>
Date: Wed, 13 Feb 2019 18:00:57 +0100
Subject: [PATCH] Mac/Linux buildfixes

---
 Common/ExceptionHandlerSetup.cpp |  4 +++-
 Common/MachineContext.h          | 12 ++++++------
 Core/MemMap.h                    |  1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Common/ExceptionHandlerSetup.cpp b/Common/ExceptionHandlerSetup.cpp
index d9c3d5c4ad..62dd26d984 100644
--- a/Common/ExceptionHandlerSetup.cpp
+++ b/Common/ExceptionHandlerSetup.cpp
@@ -7,11 +7,13 @@
 #include <cstdlib>
 #include <cstring>
 #include <vector>
+#include <thread>
 
 #include "Common/CommonFuncs.h"
 #include "Common/CommonTypes.h"
 #include "Common/MsgHandler.h"
 #include "Common/Log.h"
+#include "ext/native/thread/threadutil.h"
 
 #if defined(PPSSPP_ARCH_X86) || defined(PPSSPP_ARCH_AMD64)
 #include "Common/MachineContext.h"
@@ -103,7 +105,7 @@ static void CheckKR(const char* name, kern_return_t kr) {
 }
 
 static void ExceptionThread(mach_port_t port) {
-	Common::SetCurrentThreadName("Mach exception thread");
+	setCurrentThreadName("Mach exception thread");
 #pragma pack(4)
 	struct {
 		mach_msg_header_t Head;
diff --git a/Common/MachineContext.h b/Common/MachineContext.h
index 643fac4858..9ce074ba41 100644
--- a/Common/MachineContext.h
+++ b/Common/MachineContext.h
@@ -46,7 +46,7 @@ typedef CONTEXT SContext;
 
 #include <mach/mach.h>
 #include <mach/message.h>
-#if _M_X86_64
+#if PPSSPP_ARCH_AMD64
 typedef x86_thread_state64_t SContext;
 #define CTX_RAX __rax
 #define CTX_RBX __rbx
@@ -94,7 +94,7 @@ typedef _STRUCT_MCONTEXT64 SContext;
 #include <ucontext.h>
 typedef mcontext_t SContext;
 
-#if _M_X86_64
+#if PPSSPP_ARCH_AMD64
 #define CTX_RAX gregs[REG_RAX]
 #define CTX_RBX gregs[REG_RBX]
 #define CTX_RCX gregs[REG_RCX]
@@ -122,7 +122,7 @@ typedef mcontext_t SContext;
 #elif defined(__OpenBSD__)
 #include <signal.h>
 typedef ucontext_t SContext;
-#if _M_X86_64
+#if PPSSPP_ARCH_AMD64
 #define CTX_RAX sc_rax
 #define CTX_RBX sc_rbx
 #define CTX_RCX sc_rcx
@@ -146,7 +146,7 @@ typedef ucontext_t SContext;
 #elif defined(__NetBSD__)
 #include <ucontext.h>
 typedef mcontext_t SContext;
-#if _M_X86_64
+#if PPSSPP_ARCH_AMD64
 #define CTX_RAX __gregs[_REG_RAX]
 #define CTX_RBX __gregs[_REG_RBX]
 #define CTX_RCX __gregs[_REG_RCX]
@@ -170,7 +170,7 @@ typedef mcontext_t SContext;
 #elif defined(__FreeBSD__)
 #include <ucontext.h>
 typedef mcontext_t SContext;
-#if _M_X86_64
+#if PPSSPP_ARCH_AMD64
 #define CTX_RAX mc_rax
 #define CTX_RBX mc_rbx
 #define CTX_RCX mc_rcx
@@ -194,7 +194,7 @@ typedef mcontext_t SContext;
 #elif defined(__HAIKU__)
 #include <signal.h>
 typedef mcontext_t SContext;
-#if _M_X86_64
+#if PPSSPP_ARCH_AMD64
 #define CTX_RAX rax
 #define CTX_RBX rbx
 #define CTX_RCX rcx
diff --git a/Core/MemMap.h b/Core/MemMap.h
index a7849a6fb7..dcbbad5441 100644
--- a/Core/MemMap.h
+++ b/Core/MemMap.h
@@ -20,6 +20,7 @@
 #include "ppsspp_config.h"
 
 #include <cstring>
+#include <cstdint>
 #ifndef offsetof
 #include <stddef.h>
 #endif