livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove another case of ND_NO_BREAKPAD.

Nicky 2015-06-07 20:52:00 +02:00
parent 41f2db23e0
commit af4f13f60a
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/win_crash_logger/llcrashloggerwindows.cpp
View File

@ -48,10 +48,8 @@
#include "llsdutil.h" #include "llsdutil.h"
#include "stringize.h" #include "stringize.h"
#ifndef ND_NO_BREAKPAD
#include <client/windows/crash_generation/crash_generation_server.h> #include <client/windows/crash_generation/crash_generation_server.h>
#include <client/windows/crash_generation/client_info.h> #include <client/windows/crash_generation/client_info.h>
#endif
#define MAX_LOADSTRING 100 #define MAX_LOADSTRING 100
#define MAX_STRING 2048 #define MAX_STRING 2048
@ -358,18 +356,14 @@ void LLCrashLoggerWindows::OnClientConnected(void* context,
const google_breakpad::ClientInfo* client_info) const google_breakpad::ClientInfo* client_info)
{ {
sInstance->mClientsConnected++; sInstance->mClientsConnected++;
#ifndef ND_NO_BREAKPAD
LL_INFOS("CRASHREPORT") << "Client connected. pid = " << client_info->pid() << " total clients " << sInstance->mClientsConnected << LL_ENDL; LL_INFOS("CRASHREPORT") << "Client connected. pid = " << client_info->pid() << " total clients " << sInstance->mClientsConnected << LL_ENDL;
#endif
} }
void LLCrashLoggerWindows::OnClientExited(void* context, void LLCrashLoggerWindows::OnClientExited(void* context,
const google_breakpad::ClientInfo* client_info) const google_breakpad::ClientInfo* client_info)
{ {
sInstance->mClientsConnected--; sInstance->mClientsConnected--;
#ifndef ND_NO_BREAKPAD
LL_INFOS("CRASHREPORT") << "Client disconnected. pid = " << client_info->pid() << " total clients " << sInstance->mClientsConnected << LL_ENDL; LL_INFOS("CRASHREPORT") << "Client disconnected. pid = " << client_info->pid() << " total clients " << sInstance->mClientsConnected << LL_ENDL;
#endif
} }
@ -404,7 +398,6 @@ void LLCrashLoggerWindows::OnClientDumpRequest(void* context,
bool LLCrashLoggerWindows::initCrashServer() bool LLCrashLoggerWindows::initCrashServer()
{ {
#ifndef ND_NO_BREAKPAD
//For Breakpad on Windows we need a full Out of Process service to get good data. //For Breakpad on Windows we need a full Out of Process service to get good data.
//This routine starts up the service on a named pipe that the viewer will then //This routine starts up the service on a named pipe that the viewer will then
//communicate with. //communicate with.
@ -446,9 +439,6 @@ bool LLCrashLoggerWindows::initCrashServer()
} }
LL_INFOS("CRASHREPORT") << "Initialized OOP server with pipe named " << stringize(wpipe_name) << LL_ENDL; LL_INFOS("CRASHREPORT") << "Initialized OOP server with pipe named " << stringize(wpipe_name) << LL_ENDL;
#else
LL_INFOS("CRASHREPORT") << "Crashreporting is disabled" << LL_ENDL;
#endif
return true; return true;
} }