X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Futils%2Fhazard-pointer.c;h=89dfe54512f6c085d9872c4d26d0c0fe007ceb55;hb=ac32aa114ab7cca67498ae8da30188bbbd8923f0;hp=ced9cdad63dc9015800cd2eb38bd621646002df6;hpb=8c0cbd6e00c3677a765b5d933068ff387066b6da;p=mono.git

diff --git a/mono/utils/hazard-pointer.c b/mono/utils/hazard-pointer.c
index ced9cdad63d..89dfe54512f 100644
--- a/mono/utils/hazard-pointer.c
+++ b/mono/utils/hazard-pointer.c
@@ -14,10 +14,10 @@
 #include <mono/utils/monobitset.h>
 #include <mono/utils/lock-free-array-queue.h>
 #include <mono/utils/atomic.h>
-#include <mono/utils/mono-mutex.h>
+#include <mono/utils/mono-os-mutex.h>
 #ifdef SGEN_WITHOUT_MONO
-#include <mono/metadata/sgen-gc.h>
-#include <mono/metadata/sgen-client.h>
+#include <mono/sgen/sgen-gc.h>
+#include <mono/sgen/sgen-client.h>
 #else
 #include <mono/utils/mono-mmap.h>
 #include <mono/utils/mono-threads.h>
@@ -71,7 +71,7 @@ mono_thread_small_id_alloc (void)
 {
 	int i, id = -1;
 
-	mono_mutex_lock (&small_id_mutex);
+	mono_os_mutex_lock (&small_id_mutex);
 
 	if (!small_id_table)
 		small_id_table = mono_bitset_new (1, 0);
@@ -133,7 +133,7 @@ mono_thread_small_id_alloc (void)
 		mono_memory_write_barrier ();
 	}
 
-	mono_mutex_unlock (&small_id_mutex);
+	mono_os_mutex_unlock (&small_id_mutex);
 
 	return id;
 }
@@ -142,13 +142,13 @@ void
 mono_thread_small_id_free (int id)
 {
 	/* MonoBitSet operations are not atomic. */
-	mono_mutex_lock (&small_id_mutex);
+	mono_os_mutex_lock (&small_id_mutex);
 
 	g_assert (id >= 0 && id < small_id_table->size);
 	g_assert (mono_bitset_test_fast (small_id_table, id));
 	mono_bitset_clear_fast (small_id_table, id);
 
-	mono_mutex_unlock (&small_id_mutex);
+	mono_os_mutex_unlock (&small_id_mutex);
 }
 
 static gboolean
@@ -177,7 +177,7 @@ mono_hazard_pointer_get (void)
 
 	if (small_id < 0) {
 		static MonoThreadHazardPointers emerg_hazard_table;
-		g_warning ("Thread %p may have been prematurely finalized", (gpointer)mono_native_thread_id_get ());
+		g_warning ("Thread %p may have been prematurely finalized", (gpointer) (gsize) mono_native_thread_id_get ());
 		return &emerg_hazard_table;
 	}
 
@@ -353,7 +353,7 @@ mono_thread_smr_init (void)
 {
 	int i;
 
-	mono_mutex_init_recursive(&small_id_mutex);
+	mono_os_mutex_init_recursive(&small_id_mutex);
 	mono_counters_register ("Hazardous pointers", MONO_COUNTER_JIT | MONO_COUNTER_INT, &hazardous_pointer_count);
 
 	for (i = 0; i < HAZARD_TABLE_OVERFLOW; ++i) {