X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fzebra-lock.h;h=7aa47f9985c64910612283c7e5eb583273f7a13d;hb=a20e59c5087fb92c419f2330c786367f9ce8ccd2;hp=b7d61648de0462083d1803eb53e5b15e096878de;hpb=eb2b742588ce07fb4516bbca22c93b938b13e433;p=idzebra-moved-to-github.git

diff --git a/include/zebra-lock.h b/include/zebra-lock.h
index b7d6164..7aa47f9 100644
--- a/include/zebra-lock.h
+++ b/include/zebra-lock.h
@@ -2,7 +2,10 @@
 #ifndef ZEBRA_LOCK_H
 #define ZEBRA_LOCK_H
 
-#if HAVE_PTHREAD_H
+#ifdef WIN32
+#include <windows.h>
+#endif
+#if YAZ_POSIX_THREADS
 #include <pthread.h>
 #endif
 
@@ -11,7 +14,16 @@
 YAZ_BEGIN_CDECL
 
 typedef struct {
+#ifdef WIN32
+    CRITICAL_SECTION mutex;
+#else
+# if YAZ_POSIX_THREADS
     pthread_mutex_t mutex;
+# else
+    int dummy;
+# endif
+#endif
+    int state;
 } Zebra_mutex;
 
 YAZ_EXPORT int zebra_mutex_init (Zebra_mutex *p);
@@ -22,8 +34,10 @@ YAZ_EXPORT int zebra_mutex_unlock (Zebra_mutex *p);
 typedef struct {
     int readers_reading;
     int writers_writing;
+#if YAZ_POSIX_THREADS
     pthread_mutex_t mutex;
     pthread_cond_t lock_free;
+#endif
 } Zebra_lock_rdwr;
 
 YAZ_EXPORT int zebra_lock_rdwr_init (Zebra_lock_rdwr *p);
@@ -33,5 +47,22 @@ YAZ_EXPORT int zebra_lock_rdwr_wlock (Zebra_lock_rdwr *p);
 YAZ_EXPORT int zebra_lock_rdwr_runlock (Zebra_lock_rdwr *p);
 YAZ_EXPORT int zebra_lock_rdwr_wunlock (Zebra_lock_rdwr *p);
 
+typedef struct {
+#if YAZ_POSIX_THREADS
+    pthread_mutex_t mutex;
+    pthread_cond_t cond;
+#else
+    int dummy;
+#endif
+} Zebra_mutex_cond;
+
+YAZ_EXPORT int zebra_mutex_cond_init (Zebra_mutex_cond *p);
+YAZ_EXPORT int zebra_mutex_cond_destroy (Zebra_mutex_cond *p);
+YAZ_EXPORT int zebra_mutex_cond_lock (Zebra_mutex_cond *p);
+YAZ_EXPORT int zebra_mutex_cond_unlock (Zebra_mutex_cond *p);
+YAZ_EXPORT int zebra_mutex_cond_wait (Zebra_mutex_cond *p);
+YAZ_EXPORT int zebra_mutex_cond_signal (Zebra_mutex_cond *p);
+
 YAZ_END_CDECL
+
 #endif