X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=lib%2Fsilcutil%2Funix%2Fsilcunixmutex.c;h=0eae1496ce99ae6162ddb91e6896e1959eec045d;hb=40f8443d8d3a6577336ee66d18e04d9ac4d956bb;hp=1336eaeea7d57592db62d2983d3f4dda6efca471;hpb=d1e71f42379e8b5cd0748a7aeae8561b02cfe53d;p=silc.git diff --git a/lib/silcutil/unix/silcunixmutex.c b/lib/silcutil/unix/silcunixmutex.c index 1336eaee..0eae1496 100644 --- a/lib/silcutil/unix/silcunixmutex.c +++ b/lib/silcutil/unix/silcunixmutex.c @@ -18,27 +18,28 @@ */ /* $Id$ */ -#include "silcincludes.h" +#include "silc.h" /* SILC Mutex structure */ struct SilcMutexStruct { #ifdef SILC_THREADS pthread_mutex_t mutex; - unsigned int locked : 1; #else void *tmp; #endif /* SILC_THREADS */ }; -bool silc_mutex_alloc(SilcMutex *mutex) +SilcBool silc_mutex_alloc(SilcMutex *mutex) { #ifdef SILC_THREADS *mutex = silc_calloc(1, sizeof(**mutex)); if (*mutex == NULL) return FALSE; pthread_mutex_init(&(*mutex)->mutex, NULL); -#endif /* SILC_THREADS */ return TRUE; +#else + return FALSE; +#endif /* SILC_THREADS */ } void silc_mutex_free(SilcMutex mutex) @@ -57,8 +58,6 @@ void silc_mutex_lock(SilcMutex mutex) if (mutex) { if (pthread_mutex_lock(&mutex->mutex)) assert(FALSE); - assert(mutex->locked == 0); - mutex->locked = 1; } #endif /* SILC_THREADS */ } @@ -67,8 +66,6 @@ void silc_mutex_unlock(SilcMutex mutex) { #ifdef SILC_THREADS if (mutex) { - assert(mutex->locked == 1); - mutex->locked = 0; if (pthread_mutex_unlock(&mutex->mutex)) assert(FALSE); }