From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 17 Feb 2003 22:34:39 +0000 (+0000)
Subject: WIN32 updates
X-Git-Tag: YAZ.2.0~40
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=c76cdd28e9040ef40ae81a991a826d03b556e22c;p=yaz-moved-to-github.git

WIN32 updates
---

diff --git a/server/seshigh.c b/server/seshigh.c
index 8820d5d..f9b5923 100644
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: seshigh.c,v 1.137 2003-02-17 21:23:31 adam Exp $
+ * $Id: seshigh.c,v 1.138 2003-02-17 22:34:39 adam Exp $
  */
 
 /*
@@ -33,6 +33,7 @@
 #include <io.h>
 #define S_ISREG(x) (x & _S_IFREG)
 #include <process.h>
+#include <sys/stat.h>
 #else
 #include <sys/stat.h>
 #include <unistd.h>
@@ -661,7 +662,9 @@ static void process_http_request(association *assoc, request *req)
 #endif
 	if (!strcmp(hreq->path, "/")) 
         {
+#ifdef DOCDIR
             struct stat sbuf;
+#endif
             const char *doclink = "";
             p = z_get_HTTP_Response(o, 200);
             hres = p->u.HTTP_Response;
diff --git a/win/makefile b/win/makefile
index 28509e4..a2b309d 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,5 +1,5 @@
 # makefile.mak - makefile for MS NMAKE 
-# $Id: makefile,v 1.52 2002-12-16 14:06:34 adam Exp $
+# $Id: makefile,v 1.53 2003-02-17 22:34:39 adam Exp $
 #
 # Programmed by
 #  HL: Heikki Levanto, Index Data
@@ -31,10 +31,16 @@ HAVE_ICONV=0
 ICONV_DIR = c:\libiconv-1.7.0.1
 
 # TCL
-TCL="C:\Tcl\bin\tclsh83.exe"
-#TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
+#TCL="C:\Tcl\bin\tclsh83.exe"
+TCL="C:\Program Files\Tcl\bin\tclsh83.exe"
 HAVE_TCL=1
 
+# libxml2
+LIBXML2_DIR=c:\libxml2-2.5.3.win32
+
+LIBXML2_LIB=$(LIBXML2_DIR)\lib\libxml2.lib
+LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
+
 default: all
 
 all: dirs generate dll client ztest zoomsh
@@ -134,6 +140,7 @@ ICONV_LIB=
 COMMON_C_OPTIONS=          \
   /nologo /W3 /GX /FD /c   \
   $(ICONV_DEF)             \
+  $(LIBXML2_DEF)           \
   /D "_WINDOWS"            \
   /D "WIN32"               \
   /D "HAVE_WCHAR_H=1"      \
@@ -175,7 +182,7 @@ LINK=link.exe
 LINK_LIBS= kernel32.lib user32.lib   gdi32.lib   \
            advapi32.lib uuid.lib \
            wsock32.lib  advapi32.lib \
-           $(ICONV_LIB)
+           $(ICONV_LIB) $(LIBXML2_LIB)
 
 COMMON_LNK_OPTIONS= /nologo \
                     /subsystem:windows \
@@ -326,7 +333,10 @@ YAZ_ZUTIL_OBJS= \
    $(OBJDIR)\sortspec.obj \
    $(OBJDIR)\z3950oid.obj \
    $(OBJDIR)\charneg.obj \
-   $(OBJDIR)\grs1disp.obj
+   $(OBJDIR)\grs1disp.obj \
+   $(OBJDIR)\zgdu.obj \
+   $(OBJDIR)\soap.obj \
+   $(OBJDIR)\srw.obj
 
 Z3950_OBJS= \
    $(OBJDIR)\z-date.obj\
@@ -850,7 +860,10 @@ $(ILL_OBJS): $(ILL_CORE_FILES) $(ITEM_REQ_FILES)
 ###########################################################
 #
 # $Log: makefile,v $
-# Revision 1.52  2002-12-16 14:06:34  adam
+# Revision 1.53  2003-02-17 22:34:39  adam
+# WIN32 updates
+#
+# Revision 1.52  2002/12/16 14:06:34  adam
 # WIN32 updates for marc8.c
 #
 # Revision 1.51  2002/12/05 12:16:39  adam
diff --git a/zutil/zgdu.c b/zutil/zgdu.c
index b96bc4d..49060b7 100644
--- a/zutil/zgdu.c
+++ b/zutil/zgdu.c
@@ -2,12 +2,12 @@
  * Copyright (c) 2002-2003, Index Data.
  * See the file LICENSE for details.
  *
- * $Id: zgdu.c,v 1.4 2003-02-17 21:23:32 adam Exp $
+ * $Id: zgdu.c,v 1.5 2003-02-17 22:34:40 adam Exp $
  */
 
 #include <yaz/proto.h>
 
-#define HTTP_DEBUG 0
+#define HTTP_DEBUG 1
 
 static int decode_headers_content(ODR o, int off, Z_HTTP_Header **headers,
                                   char **content_buf, int *content_len)