From 20b3fc3c2fcef7cd1cccfe24bbce3d32cdd01f81 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sun, 17 Apr 2011 22:13:40 +0000
Subject: [PATCH] 2011-04-18 00:13 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hblzf/core.c     ! Fixed AVOID_ERRNO usage.

  * contrib/hblzf/3rd/liblzf/lzf.hbc
  * contrib/hblzf/3rd/liblzf/lzf.hbp
    + Enabled AVOID_ERRNO for wce platform.

  * INSTALL
    + Described known issue when doing partial rebuild in
      contrib area for certain (f.e. wce) platforms where
      hbmk2 autodetection lags behind core build autodetection.
---
 harbour/ChangeLog                        | 13 +++++++++++++
 harbour/INSTALL                          |  4 ++++
 harbour/contrib/hblzf/3rd/liblzf/lzf.hbc |  2 ++
 harbour/contrib/hblzf/3rd/liblzf/lzf.hbp |  1 +
 harbour/contrib/hblzf/core.c             |  6 +++---
 5 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 84fb90ee32..1869593804 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,19 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2011-04-18 00:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hblzf/core.c
+    ! Fixed AVOID_ERRNO usage.
+
+  * contrib/hblzf/3rd/liblzf/lzf.hbc
+  * contrib/hblzf/3rd/liblzf/lzf.hbp
+    + Enabled AVOID_ERRNO for wce platform.
+
+  * INSTALL
+    + Described known issue when doing partial rebuild in
+      contrib area for certain (f.e. wce) platforms where
+      hbmk2 autodetection lags behind core build autodetection.
+
 2011-04-17 11:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
     * Minor text clarification.
diff --git a/harbour/INSTALL b/harbour/INSTALL
index 4ecb309ed7..04c58a2121 100644
--- a/harbour/INSTALL
+++ b/harbour/INSTALL
@@ -222,6 +222,10 @@ HARBOUR
       cd contrib/<name>
       ..\..\bin\<plat>\<comp>\hbmk2 ..\make.hbs [clean] [install] [custom hbmk2 options]
 
+      KNOWN ISSUE: Some targets (notably wce) has to be manually configured in this
+                   scenario, since the autodetection results of core build is not
+                   available here, and hbmk2 misses some of the autodetection cases.
+
 
 
 3. HOW TO CREATE DISTRIBUTABLE PACKAGES
diff --git a/harbour/contrib/hblzf/3rd/liblzf/lzf.hbc b/harbour/contrib/hblzf/3rd/liblzf/lzf.hbc
index 1763330ae6..beb076e732 100644
--- a/harbour/contrib/hblzf/3rd/liblzf/lzf.hbc
+++ b/harbour/contrib/hblzf/3rd/liblzf/lzf.hbc
@@ -3,3 +3,5 @@
 #
 
 libs=${hb_name}
+
+cflags=-DAVOID_ERRNO=1{wce}
diff --git a/harbour/contrib/hblzf/3rd/liblzf/lzf.hbp b/harbour/contrib/hblzf/3rd/liblzf/lzf.hbp
index b86a23c269..7843c5ec29 100644
--- a/harbour/contrib/hblzf/3rd/liblzf/lzf.hbp
+++ b/harbour/contrib/hblzf/3rd/liblzf/lzf.hbp
@@ -15,6 +15,7 @@
 
 # See lzfP.h for more
 -cflag=-DVERY_FAST=1
+-cflag=-DAVOID_ERRNO=1{wce}
 
 lzf_c.c
 lzf_d.c
diff --git a/harbour/contrib/hblzf/core.c b/harbour/contrib/hblzf/core.c
index 3ba89a2fd6..ef258f71ff 100644
--- a/harbour/contrib/hblzf/core.c
+++ b/harbour/contrib/hblzf/core.c
@@ -57,7 +57,7 @@
 #include "lzf.h"
 #include "lzfP.h"
 
-#if ! defined( AVOID_ERRNO )
+#if ! AVOID_ERRNO
 #  include <errno.h>
 #endif
 
@@ -202,14 +202,14 @@ HB_FUNC( HB_LZF_DECOMPRESS )
                uiResult = lzf_decompress( in_data, in_len, buffer, buffer_size );
             }
             while( uiResult == 0
-#if ! defined( AVOID_ERRNO )
+#if ! AVOID_ERRNO
                    && errno == E2BIG
 #endif
                    );
 
             if( uiResult == 0 )
             {
-#if ! defined( AVOID_ERRNO )
+#if ! AVOID_ERRNO
                if( errno == EINVAL )
                   hb_storni( HB_LZF_DATA_CORRUPTED, 3 );
                else