X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fzebra-lock.h;h=7aa47f9985c64910612283c7e5eb583273f7a13d;hb=a20e59c5087fb92c419f2330c786367f9ce8ccd2;hp=1f4fba699cf47906dc480ee6a225ddbfbbd543e4;hpb=69da23537c6bb71ab948e079708bf8ea090de73f;p=idzebra-moved-to-github.git diff --git a/include/zebra-lock.h b/include/zebra-lock.h index 1f4fba6..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 +#endif +#if YAZ_POSIX_THREADS #include #endif @@ -11,11 +14,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 +34,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 +48,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