X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Flockutil.c;h=123f7e6f4f38c8c8cf41e75e6d5d93be3702af23;hb=1c1f26b0b758efb903aaa0a6288dfabf1efcdc17;hp=bebe318bf99f54d5f19c46210a8e0db01a24fbf8;hpb=e583a127856d4f363ff2ba7b4321bcc8c048edba;p=idzebra-moved-to-github.git

diff --git a/index/lockutil.c b/index/lockutil.c
index bebe318..123f7e6 100644
--- a/index/lockutil.c
+++ b/index/lockutil.c
@@ -1,10 +1,16 @@
 /*
- * Copyright (C) 1994-1997, Index Data I/S 
+ * Copyright (C) 1994-1999, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: lockutil.c,v $
- * Revision 1.10  1997-09-29 09:08:36  adam
+ * Revision 1.12  1999-05-26 07:49:13  adam
+ * C++ compilation.
+ *
+ * Revision 1.11  1999/02/02 14:50:59  adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.10  1997/09/29 09:08:36  adam
  * Revised locking system to be thread safe for the server.
  *
  * Revision 1.9  1997/09/25 14:54:43  adam
@@ -46,7 +52,7 @@
 #include <errno.h>
 #include <fcntl.h>
 #include <sys/types.h>
-#ifdef WINDOWS
+#ifdef WIN32
 #include <io.h>
 #include <sys/locking.h>
 #else
@@ -62,10 +68,10 @@ struct zebra_lock_info {
 
 ZebraLockHandle zebra_lock_create (const char *name, int excl_flag)
 {
-    ZebraLockHandle h = xmalloc (sizeof(*h));
+    ZebraLockHandle h = (ZebraLockHandle) xmalloc (sizeof(*h));
     h->excl_flag = excl_flag;
     h->fd = -1;
-#ifdef WINDOWS
+#ifdef WIN32
     if (!h->excl_flag)
         h->fd = open (name, O_BINARY|O_RDONLY);
     if (h->fd == -1)
@@ -103,9 +109,7 @@ void zebra_lock_prefix (Res res, char *path)
         strcat (path, "/");
 }
 
-#ifdef WINDOWS
-
-#else
+#ifndef WIN32
 static int unixLock (int fd, int type, int cmd)
 {
     struct flock area;
@@ -118,7 +122,7 @@ static int unixLock (int fd, int type, int cmd)
 
 int zebra_lock (ZebraLockHandle h)
 {
-#ifdef WINDOWS
+#ifdef WIN32
     return _locking (h->fd, _LK_LOCK, 1);
 #else
     return unixLock (h->fd, h->excl_flag ? F_WRLCK : F_RDLCK, F_SETLKW);
@@ -127,7 +131,7 @@ int zebra_lock (ZebraLockHandle h)
 
 int zebra_lock_nb (ZebraLockHandle h)
 {
-#ifdef WINDOWS
+#ifdef WIN32
     return _locking (h->fd, _LK_NBLCK, 1);
 #else
     return unixLock (h->fd, h->excl_flag ? F_WRLCK : F_RDLCK, F_SETLK);
@@ -136,7 +140,7 @@ int zebra_lock_nb (ZebraLockHandle h)
 
 int zebra_unlock (ZebraLockHandle h)
 {
-#ifdef WINDOWS
+#ifdef WIN32
     return _locking (h->fd, _LK_UNLCK, 1);
 #else
     return unixLock (h->fd, F_UNLCK, F_SETLKW);