Commit 9e368a16 authored by captainwong's avatar captainwong

update

parent 420e09e4
...@@ -28,7 +28,8 @@ ...@@ -28,7 +28,8 @@
#include <event2/bufferevent.h> #include <event2/bufferevent.h>
#include <event2/thread.h> #include <event2/thread.h>
#if defined(ENABLE_BREAKPAD) && ENABLE_BREAKPAD #ifdef ENABLE_BREAKPAD
#if ENABLE_BREAKPAD
#ifdef _WIN32 #ifdef _WIN32
#include <client/windows/handler/exception_handler.h> #include <client/windows/handler/exception_handler.h>
static bool dumpCallback(const wchar_t* dump_path, static bool dumpCallback(const wchar_t* dump_path,
...@@ -52,6 +53,7 @@ static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, ...@@ -52,6 +53,7 @@ static bool dumpCallback(const google_breakpad::MinidumpDescriptor& descriptor,
} }
#endif #endif
#endif #endif
#endif
#define DISABLE_JLIB_LOG2 #define DISABLE_JLIB_LOG2
...@@ -385,7 +387,8 @@ int main(int argc, char** argv) ...@@ -385,7 +387,8 @@ int main(int argc, char** argv)
fprintf(stderr, "failed to init libevent with thread by calling evthread_use_windows_threads\n"); fprintf(stderr, "failed to init libevent with thread by calling evthread_use_windows_threads\n");
return -1; return -1;
} }
#if defined(ENABLE_BREAKPAD) && ENABLE_BREAKPAD #ifdef ENABLE_BREAKPAD
#if ENABLE_BREAKPAD
google_breakpad::ExceptionHandler eh(L"./", // dump_path google_breakpad::ExceptionHandler eh(L"./", // dump_path
nullptr, // FilterCallback nullptr, // FilterCallback
dumpCallback, // MinidumpCallback dumpCallback, // MinidumpCallback
...@@ -393,14 +396,17 @@ int main(int argc, char** argv) ...@@ -393,14 +396,17 @@ int main(int argc, char** argv)
google_breakpad::ExceptionHandler::HANDLER_ALL // handler_types google_breakpad::ExceptionHandler::HANDLER_ALL // handler_types
); // MINIDUMP_TYPE ); // MINIDUMP_TYPE
#endif #endif
#endif
#else #else
if (0 != evthread_use_pthreads()) { if (0 != evthread_use_pthreads()) {
fprintf(stderr, "failed to init libevent with thread by calling evthread_use_pthreads\n"); fprintf(stderr, "failed to init libevent with thread by calling evthread_use_pthreads\n");
return -1; return -1;
} }
#if defined(ENABLE_BREAKPAD) && ENABLE_BREAKPAD #ifdef ENABLE_BREAKPAD
#if ENABLE_BREAKPAD
google_breakpad::ExceptionHandler eh(google_breakpad::MinidumpDescriptor("./"), nullptr, dumpCallback, nullptr, true, -1); google_breakpad::ExceptionHandler eh(google_breakpad::MinidumpDescriptor("./"), nullptr, dumpCallback, nullptr, true, -1);
#endif #endif
#endif
#endif #endif
int port = 12345; int port = 12345;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment