From e61d1bfa35706ecfe2b7878c1f43334d90259d23 Mon Sep 17 00:00:00 2001 From: kumpera Date: Thu, 1 Apr 2010 16:55:54 +0000 Subject: [PATCH] 2010-04-01 Rodrigo Kumpera * mini-exceptions.c: Fix win32 build. git-svn-id: svn+ssh://mono-cvs.ximian.com/source/trunk/mono@154651 e3ebcda4-bce8-0310-ba0a-eca2169e7518 --- mono/mini/ChangeLog | 4 ++++ mono/mini/mini-exceptions.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index c348ca6f7..5d8bca1bd 100755 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,3 +1,7 @@ +2010-04-01 Rodrigo Kumpera + + * mini-exceptions.c: Fix win32 build. + 2010-04-01 Mark Probst * mini.c, driver.c: Call mono_gc_base_init() before diff --git a/mono/mini/mini-exceptions.c b/mono/mini/mini-exceptions.c index 43d499b36..5aa521164 100644 --- a/mono/mini/mini-exceptions.c +++ b/mono/mini/mini-exceptions.c @@ -2164,9 +2164,11 @@ mono_install_handler_block_guard (MonoInternalThread *thread, MonoContext *ctx) jit_tls->handler_block_return_address = resume_ip; jit_tls->handler_block = data.ei; + +#ifndef HOST_WIN32 /*Clear current thread from been wapi interrupted otherwise things can go south*/ wapi_clear_interruption (); - +#endif return TRUE; } -- 2.11.4.GIT