Merge pull request #3498 from lioncash/global

MemTools: Get rid of a global variable

2 files changed, 4 insertions, 13 deletions

diff --git a/Source/Core/Core/MemTools.cpp b/Source/Core/Core/MemTools.cpp
index ef91d469a3..3ec3028ea4 100644
--- a/Source/Core/Core/MemTools.cpp
+++ b/Source/Core/Core/MemTools.cpp
@@ -30,8 +30,6 @@ namespace EMM
 
 #ifdef _WIN32
 
-const bool g_exception_handlers_supported = true;
-
 LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs)
 {
 	switch (pPtrs->ExceptionRecord->ExceptionCode)
@@ -100,8 +98,6 @@ void UninstallExceptionHandler() {}
 
 #elif defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE)
 
-const bool g_exception_handlers_supported = true;
-
 static void CheckKR(const char* name, kern_return_t kr)
 {
 	if (kr)
@@ -222,8 +218,6 @@ void UninstallExceptionHandler() {}
 
 #elif defined(_POSIX_VERSION) && !defined(_M_GENERIC)
 
-const bool g_exception_handlers_supported = true;
-
 static void sigsegv_handler(int sig, siginfo_t *info, void *raw_context)
 {
 	if (sig != SIGSEGV && sig != SIGBUS)
@@ -294,7 +288,6 @@ void UninstallExceptionHandler()
 }
 #else // _M_GENERIC or unsupported platform
 
-const bool g_exception_handlers_supported = false;
 void InstallExceptionHandler() {}
 void UninstallExceptionHandler() {}
 
diff --git a/Source/Core/Core/MemTools.h b/Source/Core/Core/MemTools.h
index 780541ea58..6786d847e7 100644
--- a/Source/Core/Core/MemTools.h
+++ b/Source/Core/Core/MemTools.h
@@ -4,12 +4,10 @@
 
 #pragma once
 
-#include "Common/CommonTypes.h"
-
-
 namespace EMM
 {
-	extern const bool g_exception_handlers_supported;
-	void InstallExceptionHandler();
-	void UninstallExceptionHandler();
+
+void InstallExceptionHandler();
+void UninstallExceptionHandler();
+
 }