X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=include%2Fzebra-lock.h;h=0052b83fe5fedeae8fd57c2763ef8a1b3255b545;hp=1f4fba699cf47906dc480ee6a225ddbfbbd543e4;hb=e2e073b5c947e996304ed7d577497af5e9a879ee;hpb=69da23537c6bb71ab948e079708bf8ea090de73f

diff --git a/include/zebra-lock.h b/include/zebra-lock.h
index 1f4fba6..0052b83 100644
--- a/include/zebra-lock.h
+++ b/include/zebra-lock.h
@@ -1,8 +1,31 @@
+/* This file is part of the Zebra server.
+   Copyright (C) Index Data
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
+
 
 #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,11 +34,16 @@
 YAZ_BEGIN_CDECL
 
 typedef struct {
-#if HAVE_PTHREAD_H
-    pthread_mutex_t mutex;
+#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);
@@ -26,7 +54,7 @@ YAZ_EXPORT int zebra_mutex_unlock (Zebra_mutex *p);
 typedef struct {
     int readers_reading;
     int writers_writing;
-#if HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_mutex_t mutex;
     pthread_cond_t lock_free;
 #endif
@@ -40,7 +68,7 @@ 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 HAVE_PTHREAD_H
+#if YAZ_POSIX_THREADS
     pthread_mutex_t mutex;
     pthread_cond_t cond;
 #else
@@ -58,3 +86,12 @@ YAZ_EXPORT int zebra_mutex_cond_signal (Zebra_mutex_cond *p);
 YAZ_END_CDECL
 
 #endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+