mirror/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-04-09 18:45:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3498 from lioncash/global

Browse Source 
MemTools: Get rid of a global variable
This commit is contained in:
Pierre Bourdon 2016-01-11 12:43:01 +01:00
commit 84c4f75aeb
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/MemTools.cpp
View File

@ -30,8 +30,6 @@ namespace EMM
#ifdef _WIN32 #ifdef _WIN32
const bool g_exception_handlers_supported = true;
LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs) LONG NTAPI Handler(PEXCEPTION_POINTERS pPtrs)
{ {
switch (pPtrs->ExceptionRecord->ExceptionCode) switch (pPtrs->ExceptionRecord->ExceptionCode)
@ -100,8 +98,6 @@ void UninstallExceptionHandler() {}
#elif defined(__APPLE__) && !defined(USE_SIGACTION_ON_APPLE) #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) static void CheckKR(const char* name, kern_return_t kr)
{ {
if (kr) if (kr)
@ -222,8 +218,6 @@ void UninstallExceptionHandler() {}
#elif defined(_POSIX_VERSION) && !defined(_M_GENERIC) #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) static void sigsegv_handler(int sig, siginfo_t *info, void *raw_context)
{ {
if (sig != SIGSEGV && sig != SIGBUS) if (sig != SIGSEGV && sig != SIGBUS)
@ -294,7 +288,6 @@ void UninstallExceptionHandler()
} }
#else // _M_GENERIC or unsupported platform #else // _M_GENERIC or unsupported platform
const bool g_exception_handlers_supported = false;
void InstallExceptionHandler() {} void InstallExceptionHandler() {}
void UninstallExceptionHandler() {} void UninstallExceptionHandler() {}

10
Source/Core/Core/MemTools.h
View File

@ -4,12 +4,10 @@
#pragma once #pragma once
#include "Common/CommonTypes.h"
namespace EMM namespace EMM
{ {
extern const bool g_exception_handlers_supported;
void InstallExceptionHandler(); void InstallExceptionHandler();
void UninstallExceptionHandler(); void UninstallExceptionHandler();
} }