diff --git a/Source/Core/Core/Src/x64MemTools.cpp b/Source/Core/Core/Src/x64MemTools.cpp index dad10d9e56..2594598303 100644 --- a/Source/Core/Core/Src/x64MemTools.cpp +++ b/Source/Core/Core/Src/x64MemTools.cpp @@ -7,8 +7,10 @@ #else #include #include +#ifndef ANDROID #include // Look in here for the context definition. #endif +#endif #ifdef __APPLE__ #define CREG_RAX(ctx) (*(ctx))->__ss.__rax @@ -150,6 +152,7 @@ void InstallExceptionHandler() #else // _WIN32 +#ifndef ANDROID #if defined __APPLE__ || defined __linux__ || defined __FreeBSD__ || defined _WIN32 #ifndef _WIN32 #include @@ -235,19 +238,21 @@ void sigsegv_handler(int signal, siginfo_t *info, void *raw_context) } #endif } +#endif void InstallExceptionHandler() { #ifdef _M_IX86 PanicAlertT("InstallExceptionHandler called, but this platform does not yet support it."); return; -#endif +#else struct sigaction sa; sa.sa_handler = 0; sa.sa_sigaction = &sigsegv_handler; sa.sa_flags = SA_SIGINFO; sigemptyset(&sa.sa_mask); sigaction(SIGSEGV, &sa, NULL); +#endif } #endif