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
Fixed zebra_close so that a NULL pointer is ignored.
[idzebra-moved-to-github.git]
/
index
/
zserver.c
diff --git
a/index/zserver.c
b/index/zserver.c
index
530ee8f
..
85ff5d9
100644
(file)
--- a/
index/zserver.c
+++ b/
index/zserver.c
@@
-1,10
+1,16
@@
/*
/*
- * Copyright (C) 1995-1998, Index Data
+ * Copyright (C) 1995-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: zserver.c,v $
- * Revision 1.65 1998-10-18 07:54:54 adam
+ * Revision 1.67 1999-02-02 14:51:14 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.66 1998/10/28 10:54:41 adam
+ * SDRKit integration.
+ *
+ * Revision 1.65 1998/10/18 07:54:54 adam
* Additional info added for diagnostics 114 (Unsupported use attribute) and
* 121 (Unsupported attribute set).
*
* Additional info added for diagnostics 114 (Unsupported use attribute) and
* 121 (Unsupported attribute set).
*
@@
-240,7
+246,7
@@
#include <stdio.h>
#include <assert.h>
#include <fcntl.h>
#include <stdio.h>
#include <assert.h>
#include <fcntl.h>
-#ifdef WINDOWS
+#ifdef WIN32
#include <io.h>
#include <process.h>
#else
#include <io.h>
#include <process.h>
#else
@@
-252,6
+258,13
@@
#include "zserver.h"
#include "zserver.h"
+#ifndef ZEBRASDR
+#define ZEBRASDR 0
+#endif
+#if ZEBRASDR
+#include "zebrasdr.h"
+#endif
+
static int bend_sort (void *handle, bend_sort_rr *rr);
bend_initresult *bend_init (bend_initrequest *q)
static int bend_sort (void *handle, bend_sort_rr *rr);
bend_initresult *bend_init (bend_initrequest *q)
@@
-411,7
+424,7
@@
int bend_sort (void *handle, bend_sort_rr *rr)
return 0;
}
return 0;
}
-#ifndef WINDOWS
+#ifndef WIN32
static void pre_init (struct statserv_options_block *sob)
{
char *pidfile = "zebrasrv.pid";
static void pre_init (struct statserv_options_block *sob)
{
char *pidfile = "zebrasrv.pid";
@@
-436,10
+449,13
@@
int main (int argc, char **argv)
sob = statserv_getcontrol ();
strcpy (sob->configname, FNAME_CONFIG);
sob = statserv_getcontrol ();
strcpy (sob->configname, FNAME_CONFIG);
-#ifndef WINDOWS
+#ifndef WIN32
sob->pre_init = pre_init;
#endif
statserv_setcontrol (sob);
sob->pre_init = pre_init;
#endif
statserv_setcontrol (sob);
+#if ZEBRASDR
+ zebraSdr_std ();
+#endif
return statserv_main (argc, argv);
}
return statserv_main (argc, argv);
}