X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fzebra-lock.h;h=43f68da01a236d34e5c84c28756eac55e08103e9;hb=a876f6c2860bf13e36f47c8ce938d74b4ce98b8e;hp=01f338db309da799726c8ab0e53739baa0e4c690;hpb=c41c84a497ae744aa825a90f144c85b54f1cd4bb;p=idzebra-moved-to-github.git

diff --git a/include/zebra-lock.h b/include/zebra-lock.h
index 01f338d..43f68da 100644
--- a/include/zebra-lock.h
+++ b/include/zebra-lock.h
@@ -1,8 +1,34 @@
+/* $Id: zebra-lock.h,v 1.8 2005-01-15 19:38:24 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
+
+This file is part of the Zebra server.
+
+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 Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, 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,7 +37,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 +57,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);
@@ -34,8 +71,12 @@ 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);
@@ -46,4 +87,5 @@ 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