From cae0a25d90b7ba8d55070c9db90233458c221d9e Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Mon, 7 Feb 2011 21:46:30 +0000
Subject: [PATCH] 2011-02-07 22:46 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * src/3rd/zlib/Makefile     ! Fixed pocc64 related change in
 2011-02-01 16:59 UTC+0100 Viktor Szakats       Which broke zlib in harbour
 dll on all win platforms.

      Unfortunately pocc64 is broken (6.5 even) due to bugs in the compiler,
      so I _very strongly suggest_ to take out pocc64 from tests,
      but at least not use HB_BUILD_CONTRIB_DYN=yes, when building
      it.

  * src/rtl/base64d.c
    * Copyright header tweak.
---
 harbour/ChangeLog             | 17 +++++++++++++++--
 harbour/src/3rd/zlib/Makefile |  8 +++++---
 harbour/src/rtl/base64d.c     |  3 +--
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5d80282356..8b36c8c4ae 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,11 +16,24 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-02-07 22:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * src/3rd/zlib/Makefile
+    ! Fixed pocc64 related change in 2011-02-01 16:59 UTC+0100 Viktor Szakats
+      Which broke zlib in harbour dll on all win platforms.
+
+      Unfortunately pocc64 is broken (6.5 even) due to bugs in the compiler,
+      so I _very strongly suggest_ to take out pocc64 from tests,
+      but at least not use HB_BUILD_CONTRIB_DYN=yes, when building
+      it.
+
+  * src/rtl/base64d.c
+    * Copyright header tweak.
+
 2011-02-07 13:29 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbnetio/utils/hbnetioq/netiosrq.prg
     ! Ebnabled to get information from netiosrv daemon.
-      Currently only connections info. Time interva to refresh 
-      browser is 10 seconds currently. Still a lot to be 
+      Currently only connections info. Time interva to refresh
+      browser is 10 seconds currently. Still a lot to be
       implemented based on latest features of netiosrv daemon.
       A work-in-progress.
 
diff --git a/harbour/src/3rd/zlib/Makefile b/harbour/src/3rd/zlib/Makefile
index ac250d8d99..b6d65b9d5d 100644
--- a/harbour/src/3rd/zlib/Makefile
+++ b/harbour/src/3rd/zlib/Makefile
@@ -11,6 +11,11 @@ LIBNAME := hbzlib
 HB_BUILD_WARN := no
 HB_BUILD_MODE := c
 
+# Ugly workaround to avoid fatal error when building for pocc64 (6.x)
+ifneq ($(HB_COMPILER),pocc64)
+   HB_CFLAGS_DYN := -DZLIB_DLL
+endif
+
 C_SOURCES := \
    adler32.c \
    compress.c \
@@ -33,9 +38,6 @@ ifneq ($(HB_HAS_ZLIB_LOCAL),)
    ifneq ($(filter $(HB_COMPILER),mingw mingw64 mingwarm cygwin djgpp),)
       HB_CFLAGS += -DNO_VIZ
    endif
-   ifeq ($(HB_COMPILER),bcc)
-      HB_CFLAGS_DYN += -DZLIB_DLL -DZLIB_INTERNAL
-   endif
    include $(TOP)$(ROOT)config/lib.mk
 else
    HB_SKIP_REASON := unused
diff --git a/harbour/src/rtl/base64d.c b/harbour/src/rtl/base64d.c
index 9f749da3e5..933db9c87a 100644
--- a/harbour/src/rtl/base64d.c
+++ b/harbour/src/rtl/base64d.c
@@ -7,11 +7,10 @@
  * HB_BASE64DECODE() function
  *
  * Copyright 2011 Viktor Szakats (harbour.01 syenar.hu)
- * www - http://harbour-project.org
- *
  * [ base64_decode_* functions are part of the libb64 project, and has
  *   been placed in the public domain. Author: Chris Venter
  *   For details, see http://sourceforge.net/projects/libb64 ]
+ * www - http://harbour-project.org
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by