Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'singu/master'

Browse Source
This commit is contained in:
Aleric Inglewood
2013-10-31 02:54:00 +01:00
parent e4b35a050d fcfffbb322
commit 4aa3863f17
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/llcommon/llapp.cpp
View File

@@ -163,15 +163,18 @@ void LLApp::commonCtor()
mCrashReportPipeStr = L"\\\\.\\pipe\\LLCrashReporterPipe"; mCrashReportPipeStr = L"\\\\.\\pipe\\LLCrashReporterPipe";
} }
#if LL_WINDOWS
static bool clear_CrashLoggerReserve_callback(void* context, EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion) static bool clear_CrashLoggerReserve_callback(void* context, EXCEPTION_POINTERS* exinfo, MDRawAssertionInfo* assertion)
{ {
#if LL_WINDOWS
VirtualFree(sCrashLoggerReserve, 0, MEM_RELEASE); VirtualFree(sCrashLoggerReserve, 0, MEM_RELEASE);
#else
free(sCrashLoggerReserve);
#endif
return true; return true;
} }
#else
static bool clear_CrashLoggerReserve_callback(void* context)
free(sCrashLoggerReserve);
return true;
}
#endif
LLApp::LLApp(LLErrorThread *error_thread) : LLApp::LLApp(LLErrorThread *error_thread) :
mThreadErrorp(error_thread) mThreadErrorp(error_thread)