* src/vmcore/linker.c (build_display_inner): Use MNEW instead of malloc.

[cacao.git] / src / threads / posix / generic-primitives.h

diff --git a/src/threads/posix/generic-primitives.h b/src/threads/posix/generic-primitives.h
index 5541a447b2aea26af07745c35b8f5a213ba42d78..2ab03a155d37a00313bd25dbb7a357b7296ffedd 100644 (file)
--- a/src/threads/posix/generic-primitives.h
+++ b/src/threads/posix/generic-primitives.h
@@ -39,15 +39,18 @@
 
 #include <pthread.h>
 
-extern pthread_mutex_t _cas_lock;
-extern pthread_mutex_t _mb_lock;
+#include "threads/mutex.h"
+
+
+extern mutex_t _cas_lock;
+extern mutex_t _mb_lock;
 
 
 static inline long compare_and_swap(volatile long *p, long oldval, long newval)
 {
   long ret;
 
-  pthread_mutex_lock(&_cas_lock);
+  mutex_lock(&_cas_lock);
 
   /* do the compare-and-swap */
 
@@ -56,14 +59,14 @@ static inline long compare_and_swap(volatile long *p, long oldval, long newval)
   if (oldval == ret)
     *p = newval;
 
-  pthread_mutex_unlock(&_cas_lock);
+  mutex_unlock(&_cas_lock);
 
   return ret;
 }
 
 
-#define MEMORY_BARRIER()                  (pthread_mutex_lock(&_mb_lock), \
-                                           pthread_mutex_unlock(&_mb_lock))
+#define MEMORY_BARRIER()                  (mutex_lock(&_mb_lock), \
+                                           mutex_unlock(&_mb_lock))
 #define STORE_ORDER_BARRIER()             MEMORY_BARRIER()
 #define MEMORY_BARRIER_AFTER_ATOMIC()     /* nothing */