X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fmutex.c;h=c4dba4812bcf4a5dbb64d35e84bad0df33a9202a;hp=aff0a131f77e04393a6e1e0b41de380d5576f316;hb=6533da485c4fcf4bc1bb6d70d0b18b13602381ff;hpb=b0180cb3c16e1c9e4de0697dba03337204a27a51

diff --git a/src/mutex.c b/src/mutex.c
index aff0a13..c4dba48 100644
--- a/src/mutex.c
+++ b/src/mutex.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2010 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
 
@@ -21,10 +21,12 @@
 #include <yaz/nmem.h>
 #include <yaz/log.h>
 #include <yaz/mutex.h>
-
+#include <yaz/gettimeofday.h>
 #ifdef WIN32
 #include <windows.h>
+#include <sys/timeb.h>
 #endif
+#include <time.h>
 
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
@@ -34,15 +36,7 @@
 #include <pthread.h>
 #endif
 
-struct yaz_mutex {
-#ifdef WIN32
-    CRITICAL_SECTION handle;
-#elif YAZ_POSIX_THREADS
-    pthread_mutex_t handle;
-#endif
-    char *name;
-    int log_level;
-};
+#include "mutex-p.h"
 
 void yaz_mutex_create(YAZ_MUTEX *p)
 {
@@ -80,7 +74,7 @@ void yaz_mutex_enter(YAZ_MUTEX p)
         EnterCriticalSection(&p->handle);
 #elif YAZ_POSIX_THREADS
         int r = 1; /* signal : not locked (yet) */
-        
+
         if (p->log_level)
         {   /* debugging */
             r = pthread_mutex_trylock(&p->handle);