From eb53924a77ea0de6f3a01a9e730fbce61f97199e Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 6 Nov 2010 13:20:18 +0000
Subject: [PATCH] 2010-11-06 14:18 UTC+0100 Viktor Szakats (harbour.01
 syenar.hu)   * contrib/hbexpat/hbexpat.c     ! Added missing 'enum' keyword
 to just added cast.

  ; Patches from Tamas:

  * utils/hbmk2/hbmk2.prg
    + cygwin is pic by default

  * bin/hbxpatch.hbs
    + report all missing tools in one go
---
 harbour/ChangeLog                 | 12 ++++++++++++
 harbour/bin/hbxpatch.hbs          | 10 ++++++++--
 harbour/contrib/hbexpat/hbexpat.c |  2 +-
 harbour/utils/hbmk2/hbmk2.prg     |  2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 030f952594..d12b74f74b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,18 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2010-11-06 14:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbexpat/hbexpat.c
+    ! Added missing 'enum' keyword to just added cast.
+
+  ; Patches from Tamas:
+
+  * utils/hbmk2/hbmk2.prg
+    + cygwin is pic by default
+
+  * bin/hbxpatch.hbs
+    + report all missing tools in one go
+
 2010-11-05 20:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * INSTALL
     * Reworded two sentences where HB_COMPILER/HB_PLATFORM
diff --git a/harbour/bin/hbxpatch.hbs b/harbour/bin/hbxpatch.hbs
index 0ef9cd1713..17f73fa64f 100755
--- a/harbour/bin/hbxpatch.hbs
+++ b/harbour/bin/hbxpatch.hbs
@@ -532,6 +532,7 @@ STATIC PROCEDURE SetupTools()
 #endif
    LOCAL cPathComp
    LOCAL cTool
+   LOCAL lError
 
    /* Look for g$tool first, only attempt raw name if it isn't found
     * Helps non-GNU userland systems with GNU tools installed.
@@ -552,14 +553,19 @@ STATIC PROCEDURE SetupTools()
       NEXT
    NEXT
 
+   lError := .F.
    FOR EACH cTool in hb_HKeys( s_aTools )
       IF s_aTools[ cTool ] == NIL
+         lError := .T.
          OutStd( "E: Can not find " + cTool + hb_eol() )
-         ErrorLevel( 1 )
-         QUIT
       ENDIF
    NEXT
 
+   IF lError
+      ErrorLevel( 1 )
+      QUIT
+   ENDIF
+
    RETURN
 
 STATIC FUNCTION CombinePath( ... )
diff --git a/harbour/contrib/hbexpat/hbexpat.c b/harbour/contrib/hbexpat/hbexpat.c
index 6f88b7c71d..909963d323 100644
--- a/harbour/contrib/hbexpat/hbexpat.c
+++ b/harbour/contrib/hbexpat/hbexpat.c
@@ -1076,7 +1076,7 @@ HB_FUNC( XML_SETPARAMENTITYPARSING )
    {
       PHB_EXPAT hb_expat = PHB_EXPAT_par( 1 );
 
-      hb_retni( XML_SetParamEntityParsing( hb_expat->parser, ( XML_ParamEntityParsing ) hb_parni( 2 ) ) );
+      hb_retni( XML_SetParamEntityParsing( hb_expat->parser, ( enum XML_ParamEntityParsing ) hb_parni( 2 ) ) );
    }
    else
       hb_errRT_BASE( EG_ARG, 2020, NULL, HB_ERR_FUNCNAME, HB_ERR_ARGS_BASEPARAMS );
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index 2b8666139b..19d5c58de4 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -3247,7 +3247,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel )
             ENDIF
          ENDIF
 
-         IF hbmk[ _HBMK_lCreateDyn ] .AND. !( hbmk[ _HBMK_cPLAT ] == "darwin" )
+         IF hbmk[ _HBMK_lCreateDyn ] .AND. ! HBMK_ISPLAT( "darwin|cygwin" )
             IF HBMK_ISPLAT( "hpux|sunos" )
                AAdd( hbmk[ _HBMK_aOPTC ], "-fPIC" )
             ELSE