From 2c1361022c99ef0dccedad47cfe6e6bbd0a0a5ee Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 7 Feb 2005 13:29:38 +0000
Subject: [PATCH] WIN32 compile fixes

---
 src/yaz-proxy.cpp |    9 +++++++--
 win/makefile      |   25 +++++++++++++------------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 2b1afbe..6170a1e 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy.cpp,v 1.18 2005-01-18 10:49:45 adam Exp $
+/* $Id: yaz-proxy.cpp,v 1.19 2005-02-07 13:29:38 adam Exp $
    Copyright (c) 1998-2005, Index Data.
 
 This file is part of the yaz-proxy.
@@ -19,6 +19,11 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
  */
 
+#ifdef WIN32
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TYPES_H 1
+#endif
+
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -1889,10 +1894,10 @@ void Yaz_Proxy::srw_get_client(const char *db, const char **backend_db)
 
 int Yaz_Proxy::file_access(Z_HTTP_Request *hreq)
 {
+    struct stat sbuf;
     yaz_log(YLOG_LOG, "file_access");
     if (strcmp(hreq->method, "GET"))
 	return 0;
-    struct stat sbuf;
     if (hreq->path[0] != '/')
     {
 	yaz_log(YLOG_WARN, "Bad path: %s", hreq->path);
diff --git a/win/makefile b/win/makefile
index b686c9d..d78d5cb 100644
--- a/win/makefile
+++ b/win/makefile
@@ -1,6 +1,6 @@
 # Copyright (C) 1993-2004, Index Data ApS
 # All rights reserved.
-# $Id: makefile,v 1.2 2004-04-11 17:51:10 adam Exp $
+# $Id: makefile,v 1.3 2005-02-07 13:29:38 adam Exp $
 
 ###########################################################
 ############### Parameters 
@@ -18,14 +18,14 @@ ICONV_DIR = c:\iconv-1.9.1.win32
 
 # libxslt
 HAVE_LIBXSLT=1
-LIBXSLT_DIR=c:\libxslt-1.1.4.win32
+LIBXSLT_DIR=c:\libxslt-1.1.12.win32
 
 # libxml2 (used by libxslt)
 HAVE_LIBXML2=1
-LIBXML2_DIR=c:\libxml2-2.6.7.win32
+LIBXML2_DIR=c:\libxml2-2.6.15.win32
 
 # zlib compression (used by libxml2)
-ZLIB_DIR = c:\zlib-1.1.4.win32
+ZLIB_DIR = c:\zlib-1.2.1.win32
 
 # get WIN32 binaries for libxslt, libxml, iconv, zlib from here:
 # http://www.zlatkovic.com/libxml.en.html
@@ -102,7 +102,7 @@ ICONV_LIB= \
 iconv: $(BINDIR)\iconv.dll
 
 $(BINDIR)\iconv.dll:
-  copy "$(ICONV_DIR)\lib\iconv.dll" $(BINDIR)
+  copy "$(ICONV_DIR)\bin\iconv.dll" $(BINDIR)
 !else
 ICONV_DEF= \
   /D HAVE_ICONV_H=0
@@ -114,13 +114,13 @@ iconv:
 !if $(HAVE_LIBXML2)
 LIBXML2_LIB="$(LIBXML2_DIR)\lib\libxml2.lib"
 LIBXML2_DEF=/D HAVE_XML2=1 /I"$(LIBXML2_DIR)\include"
-libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib.dll
+libxml2: $(BINDIR)\libxml2.dll $(BINDIR)\zlib1.dll
 
 $(BINDIR)\libxml2.dll:
-  copy "$(LIBXML2_DIR)\lib\libxml2.dll" $(BINDIR)
+  copy "$(LIBXML2_DIR)\bin\libxml2.dll" $(BINDIR)
 
-$(BINDIR)\zlib.dll:
-  copy "$(ZLIB_DIR)\lib\zlib.dll" $(BINDIR)
+$(BINDIR)\zlib1.dll:
+  copy "$(ZLIB_DIR)\bin\zlib1.dll" $(BINDIR)
 
 !else
 LIBXML2_LIB=
@@ -130,12 +130,12 @@ libxml2:
 !endif
 
 !if $(HAVE_LIBXSLT)
-LIBXSLT_LIB="$(LIBXSLT_DIR)\lib\libxslt.lib"
+LIBXSLT_LIB="$(LIBXSLT_DIR)\bin\libxslt.lib"
 LIBXSLT_DEF=/D HAVE_XSLT=1 /I"$(LIBXSLT_DIR)\include"
-libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib.dll
+libxslt: $(BINDIR)\libxslt.dll $(BINDIR)\zlib1.dll
 
 $(BINDIR)\libxslt.dll:
-  copy "$(LIBXSLT_DIR)\lib\libxslt.dll" $(BINDIR)
+  copy "$(LIBXSLT_DIR)\bin\libxslt.dll" $(BINDIR)
 
 !else
 LIBXSLT_LIB=
@@ -237,6 +237,7 @@ YAZPROXY_OBJS= \
 YAZPROXY_DLL_OBJS = \
    "$(OBJDIR)\yaz-proxy.obj" \
    "$(OBJDIR)\yaz-proxy-config.obj" \
+   "$(OBJDIR)\yaz-usemarcon.obj" \
    "$(OBJDIR)\yaz-bw.obj"
 
 ###########################################################
-- 
1.7.10.4