From e71a9651ba054b0609965f4a0ea7a2bdceec0278 Mon Sep 17 00:00:00 2001
From: Luiz Rafael Culik <culik@sl.conex.net>
Date: Sun, 28 May 2000 20:10:00 +0000
Subject: [PATCH] See changelog 20000528-22:50 gmt -3

---
 harbour/contrib/hbzlib/hbzip.h     | 3 ++-
 harbour/contrib/hbzlib/makefile.bc | 8 ++++----
 harbour/contrib/hbzlib/zconf.h     | 8 +++++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/harbour/contrib/hbzlib/hbzip.h b/harbour/contrib/hbzlib/hbzip.h
index 0a64b98a32..21a303a176 100644
--- a/harbour/contrib/hbzlib/hbzip.h
+++ b/harbour/contrib/hbzlib/hbzip.h
@@ -41,7 +41,7 @@
 #include "hbapiitm.h"
 #include "hbapifs.h"
 #include "hbvmpub.h"
-#include "windows.h"
+#define WIN32
 #include "zip.h"
 #if defined(HB_EXTERN_C)
 extern "C" {
@@ -51,6 +51,7 @@ extern uLong hb___filetime(char *f, tm_zip *tmzip, uLong *dt);
 extern char *hb___CheckFile( char * szFile);
 extern int hb___CompressOneFile(char *szFile,char *szFiletoCompress);
 extern int hb___CompressMultipleFile(char *szFile,PHB_ITEM pArray);
+
 #if defined(HB_EXTERN_C)
 }
 #endif
diff --git a/harbour/contrib/hbzlib/makefile.bc b/harbour/contrib/hbzlib/makefile.bc
index 6ae2cc3501..d1f8936148 100644
--- a/harbour/contrib/hbzlib/makefile.bc
+++ b/harbour/contrib/hbzlib/makefile.bc
@@ -88,18 +88,18 @@ $(ZLIB_BOR_LIB) = $(ZLIB_BOR_LIB_OBJ)
 $(ZLIB_LIB) : $(ZLIB_LIB_OBJS)
 
 $(OBJ_DIR)\zipfile1.obj : $(ZLIB_DIR)\zipfile1.c
-   $(CC) -c $(CLIBFLAGS) -o$@ $**
+   $(CC) -v -c $(CLIBFLAGS) -o$@ $**
    tlib $(ZLIB_LIB) $(ARFLAGS) -+$@,,
 
 $(OBJ_DIR)\zlibapi.obj : $(ZLIB_DIR)\zlibapi.c
-   $(CC) -c $(CLIBFLAGS) -o$@ $**
+   $(CC) -c -v $(CLIBFLAGS) -o$@ $**
    tlib $(ZLIB_LIB) $(ARFLAGS) -+$@,,
 
 $(ZLIB_BOR_DEF) : $(ZLIB_DEF_OBJ)
-    $(ID) -a $(LIB_DIR)\zlib.def  $(WINSYS_DIR)\zlib.dll
+    $(ID)  $(LIB_DIR)\zlib.def  $(WINSYS_DIR)\zlib.dll
 
 $(ZLIB_BOR_LIB) : $(ZLIB_BOR_LIB_OBJ)
-    $(IL) -a  $(LIB_DIR)\zlib_bor.lib   $(LIB_DIR)\zlib.def
+    $(IL)  $(LIB_DIR)\zlib_bor.lib   $(LIB_DIR)\zlib.def
 
 $(ZLIB_EXE) : $(ZLIB_EXE_OBJS)
 
diff --git a/harbour/contrib/hbzlib/zconf.h b/harbour/contrib/hbzlib/zconf.h
index 39801ebb0b..cab23bb7a7 100644
--- a/harbour/contrib/hbzlib/zconf.h
+++ b/harbour/contrib/hbzlib/zconf.h
@@ -175,7 +175,7 @@
 #    endif
 #  endif
 #  if defined (__BORLANDC__)
-#    if (__BORLANDC__ >= 0x0500) && defined (WIN32)
+#    if (__BORLANDC__<= 1280) && defined (WIN32)
       #include <windows.h>
       #define ZEXPORT __declspec(dllexport) WINAPI
       #define ZEXPORTRVA __declspec(dllexport) WINAPIV
@@ -196,6 +196,12 @@
 #  endif
 #endif
 
+#  if defined (__BORLANDC__)
+        #  if defined (WIN32) && !defined(ZLIB_DLL)
+              #include <windows.h>
+ #    endif
+#  endif
+
 #ifndef ZEXPORT
 #  define ZEXPORT
 #endif