Changeset 10440

Timestamp:

2005-08-08T16:15:41+12:00 (19 years ago)

Author:

kjdon

Message:

small changes so it compiles under windows

Location:

trunk/gsdl/src/recpt

Files:

• yaz_zclient.c (modified) (3 diffs)
• z3950proto.cpp (modified) (2 diffs)
• z3950proxy.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/yaz_zclient.c

@@ -45 +45 @@
 #endif
 
-#ifdef WIN32
+#ifdef __WIN32__
 #include <sys/stat.h>
 #include <io.h>
@@ -365 +365 @@
 {
     
-    if (!*session->result)
-    return NULL; /* no init info to return */
-    
     char* buffer; /* we are returning some info in this buffer */
     char *text_id="ID: ";
     char *text_name="<br>\nName: ";
     char *text_ver="<br>\nVersion: ";
+    size_t initial_length;
+    
+    if (!*session->result)
+    return NULL; /* no init info to return */
+    
    
-    size_t initial_length = strlen(text_id)+strlen(text_name)+strlen(text_ver)+
+    initial_length = strlen(text_id)+strlen(text_name)+strlen(text_ver)+
     (session->implementationId?strlen(session->implementationId):0) +
     (session->implementationName?strlen(session->implementationName):0) +
@@ -818 +820 @@
 }
 
-int cmd_open(const char *arg)
+static int cmd_open(const char *arg)
 {
     if (arg)

trunk/gsdl/src/recpt/z3950proto.cpp

@@ -32 +32 @@
 #include <stdio.h> // for (FILE *) type for yyin and fopen.
 // config file parsing stuff
+extern "C" {
 #include "z3950cfg.h" // for reading in config files - 
 // defines "struct z3950cfg *zserver_list" as the head of the list.
-
+}
 // note! yyin is hash-defined in z3950cfg.h to something else, to avoid
 // name conflicts with "other" yyins.
-extern FILE *yyin;
-extern FILE *yyout; // redirect for `errors' (unmatched tokens in flex)
-
+//extern "C" {
+FILE *yyin;
+FILE *yyout; // redirect for `errors' (unmatched tokens in flex)
+//}
 extern "C" {
   extern int zconfigparse();
@@ -588 +590 @@
   text_t query; // this should not be needed, as we have already connected to 
   // get the  title....
-  int querytype; //ditto...
+  int querytype = 1; //ditto...
   text_t field;  // ditto...
   (*zserver)->getfullrecord(query,querytype,field,request.OID.getint(),

trunk/gsdl/src/recpt/z3950proxy.cpp

@@ -27 +27 @@
 #include "comtypes.h"
 #include <stdio.h>
+
 // z39.50 yaz stuff
+#define min(a,b) (((a)<(b))?(a):(b))
 
 extern "C" {