diff --git a/mono/mini/exceptions-amd64.c b/mono/mini/exceptions-amd64.c index 349f6521c7a7b3f1b7a508312c3f009e683f32f2..dd2c0815c3e225e1c2df072086f43a7f6436687b 100644 --- a/mono/mini/exceptions-amd64.c +++ b/mono/mini/exceptions-amd64.c @@ -38,9 +38,9 @@ static MonoW32ExceptionHandler fpe_handler; static MonoW32ExceptionHandler ill_handler; static MonoW32ExceptionHandler segv_handler; -LPTOP_LEVEL_EXCEPTION_FILTER old_win_toplevel_exception_filter; -guint64 win_chained_exception_filter_result; -gboolean win_chained_exception_filter_didrun; +LPTOP_LEVEL_EXCEPTION_FILTER mono_old_win_toplevel_exception_filter; +guint64 mono_win_chained_exception_filter_result; +gboolean mono_win_chained_exception_filter_didrun; #define W32_SEH_HANDLE_EX(_ex) \ if (_ex##_handler) _ex##_handler(0, ep, sctx) @@ -56,7 +56,7 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep) MonoContext* sctx; LONG res; - win_chained_exception_filter_didrun = FALSE; + mono_win_chained_exception_filter_didrun = FALSE; res = EXCEPTION_CONTINUE_EXECUTION; er = ep->ExceptionRecord; @@ -117,20 +117,20 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep) g_free (sctx); - if (win_chained_exception_filter_didrun) - res = win_chained_exception_filter_result; + if (mono_win_chained_exception_filter_didrun) + res = mono_win_chained_exception_filter_result; return res; } void win32_seh_init() { - old_win_toplevel_exception_filter = SetUnhandledExceptionFilter(seh_handler); + mono_old_win_toplevel_exception_filter = SetUnhandledExceptionFilter(seh_handler); } void win32_seh_cleanup() { - if (old_win_toplevel_exception_filter) SetUnhandledExceptionFilter(old_win_toplevel_exception_filter); + if (mono_old_win_toplevel_exception_filter) SetUnhandledExceptionFilter(mono_old_win_toplevel_exception_filter); } void win32_seh_set_handler(int type, MonoW32ExceptionHandler handler) diff --git a/mono/mini/exceptions-x86.c b/mono/mini/exceptions-x86.c index 6f6927e0edf633add474a77148587bc5a2b63281..c9197ecd1d7badc6ac00f2d5b142c29fe288254f 100644 --- a/mono/mini/exceptions-x86.c +++ b/mono/mini/exceptions-x86.c @@ -39,9 +39,9 @@ static MonoW32ExceptionHandler fpe_handler; static MonoW32ExceptionHandler ill_handler; static MonoW32ExceptionHandler segv_handler; -LPTOP_LEVEL_EXCEPTION_FILTER old_win_toplevel_exception_filter; -guint64 win_chained_exception_filter_result; -gboolean win_chained_exception_filter_didrun; +LPTOP_LEVEL_EXCEPTION_FILTER mono_old_win_toplevel_exception_filter; +guint64 mono_win_chained_exception_filter_result; +gboolean mono_win_chained_exception_filter_didrun; #ifndef PROCESS_CALLBACK_FILTER_ENABLED # define PROCESS_CALLBACK_FILTER_ENABLED 1 @@ -178,7 +178,7 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep) struct sigcontext* sctx; LONG res; - win_chained_exception_filter_didrun = FALSE; + mono_win_chained_exception_filter_didrun = FALSE; res = EXCEPTION_CONTINUE_EXECUTION; er = ep->ExceptionRecord; @@ -231,8 +231,8 @@ LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep) g_free (sctx); - if (win_chained_exception_filter_didrun) - res = win_chained_exception_filter_result; + if (mono_win_chained_exception_filter_didrun) + res = mono_win_chained_exception_filter_result; return res; } @@ -243,12 +243,12 @@ void win32_seh_init() if (!restore_stack) restore_stack = mono_win32_get_handle_stackoverflow (); - old_win_toplevel_exception_filter = SetUnhandledExceptionFilter(seh_handler); + mono_old_win_toplevel_exception_filter = SetUnhandledExceptionFilter(seh_handler); } void win32_seh_cleanup() { - if (old_win_toplevel_exception_filter) SetUnhandledExceptionFilter(old_win_toplevel_exception_filter); + if (mono_old_win_toplevel_exception_filter) SetUnhandledExceptionFilter(mono_old_win_toplevel_exception_filter); } void win32_seh_set_handler(int type, MonoW32ExceptionHandler handler) diff --git a/mono/mini/mini-windows.c b/mono/mini/mini-windows.c index 6469cadd417e1f89250e8a710e5d4a3ccbff6d12..8b011438e575294b7b7bbe049d92e748b636eda0 100644 --- a/mono/mini/mini-windows.c +++ b/mono/mini/mini-windows.c @@ -50,9 +50,9 @@ #include "jit-icalls.h" -extern LPTOP_LEVEL_EXCEPTION_FILTER old_win_toplevel_exception_filter; -extern guint64 win_chained_exception_filter_result; -extern gboolean win_chained_exception_filter_didrun; +extern LPTOP_LEVEL_EXCEPTION_FILTER mono_old_win_toplevel_exception_filter; +extern guint64 mono_win_chained_exception_filter_result; +extern gboolean mono_win_chained_exception_filter_didrun; void mono_runtime_install_handlers (void) @@ -88,9 +88,9 @@ SIG_HANDLER_SIGNATURE (mono_chain_signal) int signal = _dummy; GET_CONTEXT; - if (old_win_toplevel_exception_filter) { - win_chained_exception_filter_didrun = TRUE; - win_chained_exception_filter_result = (*old_win_toplevel_exception_filter)(info); + if (mono_old_win_toplevel_exception_filter) { + mono_win_chained_exception_filter_didrun = TRUE; + mono_win_chained_exception_filter_result = (*mono_old_win_toplevel_exception_filter)(info); return TRUE; } return FALSE;