#include <glib.h>
#include <pthread.h>
-#include "mono-mutex.h"
+#include <mono/utils/mono-mutex.h>
+
+G_BEGIN_DECLS
typedef struct _WapiCriticalSection WapiCriticalSection;
extern void DeleteCriticalSection(WapiCriticalSection *section);
extern guint32 SetCriticalSectionSpinCount(WapiCriticalSection *section, guint32 spincount);
extern gboolean TryEnterCriticalSection(WapiCriticalSection *section);
-extern void EnterCriticalSection(WapiCriticalSection *section);
-extern void LeaveCriticalSection(WapiCriticalSection *section);
+
+/* These two are perf critical so avoid the wrapper function */
+
+#define EnterCriticalSection(section) do { \
+ int ret = mono_mutex_lock(&(section)->mutex); \
+ if (ret != 0) \
+ g_warning ("Bad call to mono_mutex_lock result %d", ret); \
+ g_assert (ret == 0); \
+} while (0)
+
+#define LeaveCriticalSection(section) do { \
+ int ret = mono_mutex_unlock(&(section)->mutex); \
+ if (ret != 0) \
+ g_warning ("Bad call to mono_mutex_unlock result %d", ret); \
+ g_assert (ret == 0); \
+} while (0)
+
+G_END_DECLS
#endif /* _WAPI_CRITICAL_SECTIONS_H_ */