Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / mono / metadata / monitor.h

diff --git a/mono/metadata/monitor.h b/mono/metadata/monitor.h
index 3c479f5736f910f7f1086dec5e829d5eb7d818c6..f0babcc7396eb7c87f77d442f2447ee06eaf5b0e 100644 (file)
--- a/mono/metadata/monitor.h
+++ b/mono/metadata/monitor.h
@@ -1,5 +1,6 @@
-/*
- * monitor.h: Monitor locking functions
+/**
+ * \file
+ * Monitor locking functions
  *
  * Author:
  *     Dick Porter (dick@ximian.com)
@@ -12,7 +13,6 @@
 
 #include <glib.h>
 #include <mono/metadata/object.h>
-#include <mono/io-layer/io-layer.h>
 #include <mono/utils/mono-compiler.h>
 #include <mono/utils/mono-coop-semaphore.h>
 
@@ -107,8 +107,11 @@ MONO_API void mono_locks_dump (gboolean include_untaken);
 void mono_monitor_init (void);
 void mono_monitor_cleanup (void);
 
-MonoBoolean mono_monitor_enter_fast (MonoObject *obj);
-MonoBoolean mono_monitor_enter_v4_fast (MonoObject *obj, char *lock_taken);
+MonoBoolean mono_monitor_enter_internal (MonoObject *obj);
+void mono_monitor_enter_v4_internal (MonoObject *obj, MonoBoolean *lock_taken);
+
+guint32 mono_monitor_enter_fast (MonoObject *obj);
+guint32 mono_monitor_enter_v4_fast (MonoObject *obj, MonoBoolean *lock_taken);
 
 guint32 mono_monitor_get_object_monitor_gchandle (MonoObject *object);
 
@@ -116,12 +119,12 @@ void mono_monitor_threads_sync_members_offset (int *status_offset, int *nest_off
 #define MONO_THREADS_SYNC_MEMBER_OFFSET(o)     ((o)>>8)
 #define MONO_THREADS_SYNC_MEMBER_SIZE(o)       ((o)&0xff)
 
-MonoBoolean ves_icall_System_Threading_Monitor_Monitor_test_owner (MonoObject *obj);
-MonoBoolean ves_icall_System_Threading_Monitor_Monitor_test_synchronised (MonoObject *obj);
-void ves_icall_System_Threading_Monitor_Monitor_pulse (MonoObject *obj);
-void ves_icall_System_Threading_Monitor_Monitor_pulse_all (MonoObject *obj);
-MonoBoolean ves_icall_System_Threading_Monitor_Monitor_wait (MonoObject *obj, guint32 ms);
-void ves_icall_System_Threading_Monitor_Monitor_try_enter_with_atomic_var (MonoObject *obj, guint32 ms, char *lockTaken);
+extern MonoBoolean ves_icall_System_Threading_Monitor_Monitor_test_owner(MonoObject *obj);
+extern MonoBoolean ves_icall_System_Threading_Monitor_Monitor_test_synchronised(MonoObject *obj);
+extern void ves_icall_System_Threading_Monitor_Monitor_pulse(MonoObject *obj);
+extern void ves_icall_System_Threading_Monitor_Monitor_pulse_all(MonoObject *obj);
+extern MonoBoolean ves_icall_System_Threading_Monitor_Monitor_wait(MonoObject *obj, guint32 ms);
+extern void ves_icall_System_Threading_Monitor_Monitor_try_enter_with_atomic_var (MonoObject *obj, guint32 ms, MonoBoolean *lockTaken);
 
 G_END_DECLS