From fcfffbb3222aef85e98b9117950cba8148e2e1ba Mon Sep 17 00:00:00 2001 From: Latif Khalifa Date: Thu, 31 Oct 2013 02:51:58 +0100 Subject: [PATCH] breakpad filter signature is different on windows compated to other platforms --- indra/llcommon/llapp.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/indra/llcommon/llapp.cpp b/indra/llcommon/llapp.cpp index b61654fdc..60eaf802e 100644 --- a/indra/llcommon/llapp.cpp +++ b/indra/llcommon/llapp.cpp @@ -163,15 +163,18 @@ void LLApp::commonCtor() mCrashReportPipeStr = L"\\\\.\\pipe\\LLCrashReporterPipe"; } +#if LL_WINDOWS static bool clear_CrashLoggerReserve_callback(void* context, EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion) { -#if LL_WINDOWS VirtualFree(sCrashLoggerReserve, 0, MEM_RELEASE); -#else - free(sCrashLoggerReserve); -#endif return true; } +#else +static bool clear_CrashLoggerReserve_callback(void* context) + free(sCrashLoggerReserve); + return true; +} +#endif LLApp::LLApp(LLErrorThread *error_thread) : mThreadErrorp(error_thread)