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
Updated various routines to handle missing explain schema.
[idzebra-moved-to-github.git]
/
index
/
locksrv.c
diff --git
a/index/locksrv.c
b/index/locksrv.c
index
57f106e
..
22ea3b5
100644
(file)
--- a/
index/locksrv.c
+++ b/
index/locksrv.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: locksrv.c,v $
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: locksrv.c,v $
- * Revision 1.11 1998-03-05 08:45:12 adam
+ * Revision 1.13 1999-05-26 07:49:13 adam
+ * C++ compilation.
+ *
+ * Revision 1.12 1999/02/02 14:50:58 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.11 1998/03/05 08:45:12 adam
* New result set model and modular ranking system. Moved towards
* descent server API. System information stored as "SGML" records.
*
* New result set model and modular ranking system. Moved towards
* descent server API. System information stored as "SGML" records.
*
@@
-46,7
+52,7
@@
*/
#include <stdio.h>
#include <assert.h>
*/
#include <stdio.h>
#include <assert.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <io.h>
#else
#include <unistd.h>
#include <io.h>
#else
#include <unistd.h>
@@
-67,7
+73,7
@@
int zebra_server_lock_init (ZebraHandle zi)
zi->server_lock_org = NULL;
zebra_lock_prefix (zi->res, path_prefix);
zi->server_lock_org = NULL;
zebra_lock_prefix (zi->res, path_prefix);
- zi->server_path_prefix = xmalloc (strlen(path_prefix)+1);
+ zi->server_path_prefix = (char *) xmalloc (strlen(path_prefix)+1);
strcpy (zi->server_path_prefix, path_prefix);
logf (LOG_DEBUG, "Locking system initialized");
strcpy (zi->server_path_prefix, path_prefix);
logf (LOG_DEBUG, "Locking system initialized");