Skip to content

Commit 77cafc2

Browse files
authored
fix 2
1 parent 0a10150 commit 77cafc2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/supertux/error_handler.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ void
5151
ErrorHandler::set_handlers()
5252
{
5353
#ifdef WIN32
54-
SetUnhandledExceptionFilter(seh_handler);
54+
SetUnhandledExceptionFilter(supertux_seh_handler);
5555
#elif defined(UNIX)
5656
signal(SIGSEGV, handle_error);
5757
signal(SIGABRT, handle_error);
@@ -278,8 +278,8 @@ ErrorHandler::get_system_info()
278278
}
279279

280280
#ifdef WIN32
281-
LONG
282-
ErrorHandler::seh_handler(_EXCEPTION_POINTERS* ExceptionInfo)
281+
LONG WINAPI
282+
ErrorHandler::supertux_seh_handler(_EXCEPTION_POINTERS* ExceptionInfo)
283283
{
284284
pcontext = ExceptionInfo->ContextRecord;
285285
error_dialog_crash(get_stacktrace());

src/supertux/error_handler.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace ErrorHandler {
3434
void error_dialog_exception(const std::string& exception = "");
3535

3636
#ifdef WIN32
37-
LONG WINAPI seh_handler(_In_ _EXCEPTION_POINTERS* ExceptionInfo);
37+
LONG WINAPI supertux_seh_handler(_In_ _EXCEPTION_POINTERS* ExceptionInfo);
3838
//CONTEXT* pcontext;
3939
#else
4040
[[ noreturn ]] void handle_error(int sig);

0 commit comments

Comments
 (0)