From 0a0da682440bd750223d9d8cc7e3a7f5ddefd0e2 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 23 Feb 2010 08:25:34 +0000
Subject: [PATCH] 2010-02-23 09:25 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbmzip/ioapi.c   * contrib/hbmzip/zip.c   *
 contrib/hbmzip/unzip.c   * contrib/hbmzip/zip.h   * contrib/hbmzip/unzip.h  
 * contrib/xhb/hbcomprs.c     % Using hbzlib.h directly instead of hbzlib.h.  
   ; TODO: Delete hbzlib.h.

---
 harbour/ChangeLog              | 18 ++++++++++++++----
 harbour/contrib/hbmzip/ioapi.c |  2 +-
 harbour/contrib/hbmzip/unzip.c |  2 +-
 harbour/contrib/hbmzip/unzip.h |  2 +-
 harbour/contrib/hbmzip/zip.c   |  2 +-
 harbour/contrib/hbmzip/zip.h   |  2 +-
 harbour/contrib/xhb/hbcomprs.c |  3 ++-
 7 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b0438033d7..8e6ee41472 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,16 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-02-23 09:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbmzip/ioapi.c
+  * contrib/hbmzip/zip.c
+  * contrib/hbmzip/unzip.c
+  * contrib/hbmzip/zip.h
+  * contrib/hbmzip/unzip.h
+  * contrib/xhb/hbcomprs.c
+    % Using hbzlib.h directly instead of hbzlib.h.
+    ; TODO: Delete hbzlib.h.
+
 2010-02-22 19:05 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbide/idedocks.prg
   * contrib/hbide/resources/docviewgenerator.ui
@@ -126,7 +136,7 @@
     ! Fixed to setup all OS/2 INCL_* constants and
       to #include os2.h by themselves, and not to rely
       on Harbour headers to do this job for them.
-    ; TODO: Do the same for dos.h.
+    ; TODO: Do the same for dos.h. [DONE]
 
   * doc/hdr_tpl.txt
     - Deleted local changelog.
@@ -158,7 +168,7 @@
     + Added logic to #include OS/2 headers with some INCL_
       macros defined, to make QT on OS/2 happy. (copied them
       from the dev. list)
-    ; TODO: Regenerate HBQT sources.
+    ; TODO: Regenerate HBQT sources. [DONE]
 
   * utils/hbtest/hbtest.prg
     ! Cleaned old problem reported by Chen. It seems like
@@ -2024,8 +2034,8 @@
     ; From now on the recommended native DLL interface for Harbour apps is:
         WAPI_LOADLIBRARY(), WAPI_GETPROCADDRESS(), WAPI_FREELIBRARY() and
         WIN_DLLCALL()
-    ; TODO: Solve GC collected HMODULE in above WAPI LIB handling functions.
-    ; TODO: Clean HB_LIB*() vs. WAPI LIB handling confusion.
+    ; TODO: Solve GC collected HMODULE in above WAPI LIB handling functions. [DONE]
+    ; TODO: Clean HB_LIB*() vs. WAPI LIB handling confusion. [DONE]
 
   * contrib/hbwin/tests/testdll.prg
     * Changed to use WAPI_LOADLIBRARY()/WAPI_FREELIBRARY()
diff --git a/harbour/contrib/hbmzip/ioapi.c b/harbour/contrib/hbmzip/ioapi.c
index b26153f8a0..c345395024 100644
--- a/harbour/contrib/hbmzip/ioapi.c
+++ b/harbour/contrib/hbmzip/ioapi.c
@@ -11,7 +11,7 @@
 #include <string.h>
 
 #include "hbapifs.h"
-#include "hbzlib.h"
+#include "zlib.h"
 #include "ioapi.h"
 
 
diff --git a/harbour/contrib/hbmzip/unzip.c b/harbour/contrib/hbmzip/unzip.c
index fe59818aa0..f6e562888c 100644
--- a/harbour/contrib/hbmzip/unzip.c
+++ b/harbour/contrib/hbmzip/unzip.c
@@ -38,7 +38,7 @@ woven in by Terry Thorsen 1/2003.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "hbzlib.h"
+#include "zlib.h"
 #include "unzip.h"
 #include "hbapi.h"      /* for hb_xgrab()/hb_xfree() */
 
diff --git a/harbour/contrib/hbmzip/unzip.h b/harbour/contrib/hbmzip/unzip.h
index d91fb37471..b247937c80 100644
--- a/harbour/contrib/hbmzip/unzip.h
+++ b/harbour/contrib/hbmzip/unzip.h
@@ -50,7 +50,7 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_H
-#include "hbzlib.h"
+#include "zlib.h"
 #endif
 
 #ifndef _ZLIBIOAPI_H
diff --git a/harbour/contrib/hbmzip/zip.c b/harbour/contrib/hbmzip/zip.c
index c3d6f84ccc..ecf085f0e9 100644
--- a/harbour/contrib/hbmzip/zip.c
+++ b/harbour/contrib/hbmzip/zip.c
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include "hbzlib.h"
+#include "zlib.h"
 #include "zip.h"
 #include "hbapi.h"      /* for hb_xgrab()/hb_xfree() */
 
diff --git a/harbour/contrib/hbmzip/zip.h b/harbour/contrib/hbmzip/zip.h
index 3efa1feae6..acacce83b9 100644
--- a/harbour/contrib/hbmzip/zip.h
+++ b/harbour/contrib/hbmzip/zip.h
@@ -51,7 +51,7 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_H
-#include "hbzlib.h"
+#include "zlib.h"
 #endif
 
 #ifndef _ZLIBIOAPI_H
diff --git a/harbour/contrib/xhb/hbcomprs.c b/harbour/contrib/xhb/hbcomprs.c
index 4c989349c1..e833c8438c 100644
--- a/harbour/contrib/xhb/hbcomprs.c
+++ b/harbour/contrib/xhb/hbcomprs.c
@@ -55,7 +55,8 @@
 #include "hbstack.h"
 #include "hbapierr.h"
 #include "hbvm.h"
-#include "hbzlib.h"
+
+#include <zlib.h>
 
 /*******************************************************************
 * Giancarlo Niccolai: