projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
POSIX thread updates. First work on term sets.
[idzebra-moved-to-github.git]
/
include
/
zebra-lock.h
diff --git
a/include/zebra-lock.h
b/include/zebra-lock.h
index
01f338d
..
7aa47f9
100644
(file)
--- a/
include/zebra-lock.h
+++ b/
include/zebra-lock.h
@@
-2,7
+2,10
@@
#ifndef ZEBRA_LOCK_H
#define ZEBRA_LOCK_H
#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
#include <pthread.h>
#endif
@@
-11,7
+14,16
@@
YAZ_BEGIN_CDECL
typedef struct {
YAZ_BEGIN_CDECL
typedef struct {
+#ifdef WIN32
+ CRITICAL_SECTION mutex;
+#else
+# if YAZ_POSIX_THREADS
pthread_mutex_t mutex;
pthread_mutex_t mutex;
+# else
+ int dummy;
+# endif
+#endif
+ int state;
} Zebra_mutex;
YAZ_EXPORT int zebra_mutex_init (Zebra_mutex *p);
} 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;
typedef struct {
int readers_reading;
int writers_writing;
+#if YAZ_POSIX_THREADS
pthread_mutex_t mutex;
pthread_cond_t lock_free;
pthread_mutex_t mutex;
pthread_cond_t lock_free;
+#endif
} Zebra_lock_rdwr;
YAZ_EXPORT int zebra_lock_rdwr_init (Zebra_lock_rdwr *p);
} Zebra_lock_rdwr;
YAZ_EXPORT int zebra_lock_rdwr_init (Zebra_lock_rdwr *p);
@@
-34,8
+48,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 {
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;
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);
} Zebra_mutex_cond;
YAZ_EXPORT int zebra_mutex_cond_init (Zebra_mutex_cond *p);
@@
-46,4
+64,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
YAZ_EXPORT int zebra_mutex_cond_signal (Zebra_mutex_cond *p);
YAZ_END_CDECL
+
#endif
#endif