2007-10-20 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / io-layer / mono-mutex.h

diff --git a/mono/io-layer/mono-mutex.h b/mono/io-layer/mono-mutex.h
index 8e233167629ef3bc4ac7956f8fa49260a62c288b..2f8c656e97ab4cb593865f00331f54dea7698f3a 100644 (file)
--- a/mono/io-layer/mono-mutex.h
+++ b/mono/io-layer/mono-mutex.h
@@ -33,11 +33,7 @@ extern "C" {
 #include <pthread.h>
 #include <time.h>
 
-#ifndef HAVE_PTHREAD_MUTEX_TIMEDLOCK
-extern int pthread_mutex_timedlock (pthread_mutex_t *mutex,
-                                   const struct timespec *timeout);
-#endif /* HAVE_PTHREAD_MUTEX_TIMEDLOCK */
-
+G_BEGIN_DECLS
 
 typedef struct {
        pthread_mutex_t mutex;
@@ -94,7 +90,6 @@ typedef struct _mono_mutex_t {
 #define MONO_MUTEX_INITIALIZER { 0, MONO_THREAD_NONE, 0, 0, PTHREAD_MUTEX_INITIALIZER, 0 }
 #define MONO_RECURSIVE_MUTEX_INITIALIZER { 0, MONO_THREAD_NONE, 0, 0, PTHREAD_MUTEX_INITIALIZER, PTHREAD_COND_INITIALIZER }
 
-
 int mono_mutexattr_init (mono_mutexattr_t *attr);
 int mono_mutexattr_settype (mono_mutexattr_t *attr, int type);
 int mono_mutexattr_gettype (mono_mutexattr_t *attr, int *type);
@@ -149,6 +144,7 @@ typedef pthread_mutexattr_t mono_mutexattr_t;
 #define mono_mutexattr_getprotocol(attr,protocol) pthread_mutexattr_getprotocol (attr, protocol)
 #define mono_mutexattr_setprioceiling(attr,prioceiling) pthread_mutexattr_setprioceiling (attr, prioceiling)
 #define mono_mutexattr_getprioceiling(attr,prioceiling) pthread_mutexattr_getprioceiling (attr, prioceiling)
+#define mono_mutexattr_destroy(attr) pthread_mutexattr_destroy (attr)
 
 #define mono_mutex_init(mutex,attr) pthread_mutex_init (mutex, attr)
 #define mono_mutex_lock(mutex) pthread_mutex_lock (mutex)
@@ -165,6 +161,15 @@ typedef pthread_mutexattr_t mono_mutexattr_t;
 
 #endif /* USE_MONO_MUTEX */
 
+/* This is a function so it can be passed to pthread_cleanup_push -
+ * that is a macro and giving it a macro as a parameter breaks.
+ */
+G_GNUC_UNUSED
+static inline int mono_mutex_unlock_in_cleanup (mono_mutex_t *mutex)
+{
+       return(mono_mutex_unlock (mutex));
+}
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */