From 453b0e0cd972787f62dd22c0d3fee9dbe212bdf5 Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Tue, 16 Sep 2008 23:30:28 +0000
Subject: [PATCH] 2008-09-17 01:29 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/make_xmingwce.sh   *
 harbour/make_xmingw.sh     + added an option to build utility binaries in
 cross builds

  * harbour/source/vm/thread.c
    ! fixes in OS2 builds MT builds
---
 harbour/ChangeLog          |  8 ++++++++
 harbour/make_xmingw.sh     |  2 +-
 harbour/make_xmingwce.sh   |  2 +-
 harbour/source/vm/thread.c | 10 ++++------
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a8dfc62561..d181ab815c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-09-17 01:29 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/make_xmingwce.sh
+  * harbour/make_xmingw.sh
+    + added an option to build utility binaries in cross builds
+
+  * harbour/source/vm/thread.c
+    ! fixes in OS2 builds MT builds
+
 2008-09-17 01:17 UTC+0200 Viktor Szakats (harbour.01 syenar hu)
   * debian/changelog
     * Synced with 1.0.1.
diff --git a/harbour/make_xmingw.sh b/harbour/make_xmingw.sh
index e3833eedb3..fc4c5087f0 100755
--- a/harbour/make_xmingw.sh
+++ b/harbour/make_xmingw.sh
@@ -110,7 +110,7 @@ export PATH CCPATH CCPREFIX
 
 export HB_TOOLS_PREF="hbw"
 export HB_XBUILD="w32"
-export HB_HOST_BUILD="lib"
+[ "${HB_HOST_BUILD}" = "all" ] || export HB_HOST_BUILD="lib"
 
 export HB_BIN_COMPILE="/tmp/hb-xmingw-$$"
 rm -fR "${HB_BIN_COMPILE}"
diff --git a/harbour/make_xmingwce.sh b/harbour/make_xmingwce.sh
index da1bbb9962..1cc4883bb2 100755
--- a/harbour/make_xmingwce.sh
+++ b/harbour/make_xmingwce.sh
@@ -70,7 +70,7 @@ fi
 export CCPATH="${CCPATH}:"
 export HB_TOOLS_PREF="hbce"
 export HB_XBUILD="wce"
-export HB_HOST_BUILD="lib"
+[ "${HB_HOST_BUILD}" = "all" ] || export HB_HOST_BUILD="lib"
 export HB_GT_LIB="gtwvt"
 
 export HB_BIN_COMPILE="/tmp/hb-${CCPREFIX}-$$"
diff --git a/harbour/source/vm/thread.c b/harbour/source/vm/thread.c
index 7dc1d05d3e..816c13a5bd 100644
--- a/harbour/source/vm/thread.c
+++ b/harbour/source/vm/thread.c
@@ -347,11 +347,9 @@ HB_THREAD_T hb_threadCreate( PHB_THREAD_STARTFUNC start_func, void * Cargo )
    if( pthread_create( &th_id, NULL, start_func, Cargo ) != 0 )
       th_id = 0;
 #elif defined( HB_OS_WIN_32 )
-   if( ( th_id = ( HANDLE ) _beginthreadex( NULL, 0, start_func, Cargo, 0, NULL ) ) == 0 )
-      th_id = 0;
+   th_id = ( HANDLE ) _beginthreadex( NULL, 0, start_func, Cargo, 0, NULL );
 #elif defined( HB_OS_OS2 )
-   if( ( th_id = _beginthread( ( void * ) start_func, NULL, 128 * 1024, Cargo ) ) < 0 )
-      th_id = 0;
+   th_id = _beginthread( ( void * ) start_func, NULL, 128 * 1024, Cargo );
 #else
    { int TODO_MT; }
    th_id = 0;
@@ -375,7 +373,7 @@ BOOL hb_threadJoin( HB_THREAD_T th_id )
    }
    return FALSE;
 #elif defined( HB_OS_OS2 )
-   return DosWaitThread( th_id, DCWW_WAIT ) == NO_ERROR;
+   return DosWaitThread( &th_id, DCWW_WAIT ) == NO_ERROR;
 #else
    { int TODO_MT; }
    return FALSE;
@@ -399,7 +397,7 @@ BOOL hb_threadDetach( HB_THREAD_T th_id )
     *       does not keep thread pointer item alive and the cleanup code
     *       will be executed by THIS thread.
     */
-   return DosWaitThread( th_id, DCWW_NOWAIT ) == NO_ERROR;
+   return DosWaitThread( &th_id, DCWW_NOWAIT ) == NO_ERROR;
 #else
    { int TODO_MT; }
    return FALSE;