Merge pull request #3114 from alexanderkyte/mono_conf_gc

[mono.git] / mono / utils / mono-coop-mutex.h

diff --git a/mono/utils/mono-coop-mutex.h b/mono/utils/mono-coop-mutex.h
index 95856feb346c696e910900cca07afa4dd56ada7c..92ae719d7ba653080ecada657c71f3263678dba8 100644 (file)
--- a/mono/utils/mono-coop-mutex.h
+++ b/mono/utils/mono-coop-mutex.h
@@ -6,7 +6,7 @@
 #include <glib.h>
 
 #include "mono-os-mutex.h"
-#include "mono-threads.h"
+#include "mono-threads-api.h"
 
 G_BEGIN_DECLS
 
@@ -50,11 +50,11 @@ mono_coop_mutex_lock (MonoCoopMutex *mutex)
        if (mono_os_mutex_trylock (&mutex->m) == 0)
                return 0;
 
-       MONO_PREPARE_BLOCKING;
+       MONO_ENTER_GC_SAFE;
 
        res = mono_os_mutex_lock (&mutex->m);
 
-       MONO_FINISH_BLOCKING;
+       MONO_EXIT_GC_SAFE;
 
        return res;
 }
@@ -88,11 +88,11 @@ mono_coop_cond_wait (MonoCoopCond *cond, MonoCoopMutex *mutex)
 {
        gint res;
 
-       MONO_PREPARE_BLOCKING;
+       MONO_ENTER_GC_SAFE;
 
        res = mono_os_cond_wait (&cond->c, &mutex->m);
 
-       MONO_FINISH_BLOCKING;
+       MONO_EXIT_GC_SAFE;
 
        return res;
 }
@@ -102,11 +102,11 @@ mono_coop_cond_timedwait (MonoCoopCond *cond, MonoCoopMutex *mutex, guint32 time
 {
        gint res;
 
-       MONO_PREPARE_BLOCKING;
+       MONO_ENTER_GC_SAFE;
 
-       res = mono_os_cond_timedwait_ms (&cond->c, &mutex->m, timeout_ms);
+       res = mono_os_cond_timedwait (&cond->c, &mutex->m, timeout_ms);
 
-       MONO_FINISH_BLOCKING;
+       MONO_EXIT_GC_SAFE;
 
        return res;
 }