2005-01-11 Zoltan Varga <vargaz@freemail.hu>

	* threads.c (interruption_request_apc): Decore APC callbacks with CALLBACK under win32.

svn path=/trunk/mono/; revision=38657

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 90bf7c1adf06d4b328215f9e18d83ee3d708ffdd..6c579ae0c59d27af38165c64e7748a93fdde8fe9 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,6 @@
+2005-01-11  Zoltan Varga  <vargaz@freemail.hu>
+
+       * threads.c (interruption_request_apc): Decore APC callbacks with CALLBACK under win32.
 
 Mon Jan 10 18:47:28 CET 2005 Paolo Molaro <lupus@ximian.com>
 

diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
index 97e8899bba3202f888a7b1c0270cdc934c3b1b36..1150e87490522e53811bc1f101d4f54d6bb4fbc8 100644 (file)
--- a/mono/metadata/threads.c
+++ b/mono/metadata/threads.c
@@ -1219,7 +1219,7 @@ mono_thread_get_abort_signal (void)
 }
 
 #ifdef __MINGW32__
-static guint32 interruption_request_apc (gpointer param)
+static CALLBACK void interruption_request_apc (ULONG_PTR param)
 {
        MonoException* exc = mono_thread_request_interruption (FALSE);
        if (exc) mono_raise_exception (exc);
@@ -2151,11 +2151,16 @@ void mono_gc_start_world (void)
        LeaveCriticalSection (&threads_mutex);
 }
 
-
+#ifdef __MINGW32__
+static CALLBACK void dummy_apc (ULONG_PTR param)
+{
+}
+#else
 static guint32 dummy_apc (gpointer param)
 {
        return 0;
 }
+#endif
 
 /*
  * mono_thread_execute_interruption