diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 16faee0de0..3c2137f1a7 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-09 21:32 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/hbzlibgz.c + ! In block declaration in recent patch. + * utils/hbmk2/hbmk2.prg + ! Regression in recent xhb patch. + * contrib/hbwin/axcore.c + ! Format warning in trace. + 2011-03-09 20:00 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbnetio/utils/hbnetio/hbnetio.hbp * contrib/hbnetio/utils/hbnetio/netiosrv.prg diff --git a/harbour/contrib/hbwin/axcore.c b/harbour/contrib/hbwin/axcore.c index a2bd242a42..1ea8d3c3ba 100644 --- a/harbour/contrib/hbwin/axcore.c +++ b/harbour/contrib/hbwin/axcore.c @@ -421,7 +421,7 @@ static HRESULT _get_default_sink( IDispatch * iDisp, const char * szEvent, IID * } else { - HB_TRACE( HB_TR_DEBUG, ("_get_default_sink IProvideClassInfo2 obtain error %08X", hr) ); + HB_TRACE( HB_TR_DEBUG, ("_get_default_sink IProvideClassInfo2 obtain error %08lX", hr) ); } @@ -468,7 +468,7 @@ static HRESULT _get_default_sink( IDispatch * iDisp, const char * szEvent, IID * } else { - HB_TRACE( HB_TR_DEBUG, ("_get_default_sink IProvideClassInfo obtain error %08X", hr) ); + HB_TRACE( HB_TR_DEBUG, ("_get_default_sink IProvideClassInfo obtain error %08lX", hr) ); } } diff --git a/harbour/src/rtl/hbzlibgz.c b/harbour/src/rtl/hbzlibgz.c index df345feb34..0ca2f2a4bd 100644 --- a/harbour/src/rtl/hbzlibgz.c +++ b/harbour/src/rtl/hbzlibgz.c @@ -95,9 +95,12 @@ HB_FUNC( HB_GZOPEN ) const char * cFile = hb_parc( 1 ), * cMode = hb_parc( 2 ); if( cFile && cMode ) { + gzFile gz; + hb_vmUnlock(); - gzFile gz = gzopen( cFile, cMode ); + gz = gzopen( cFile, cMode ); hb_vmLock(); + if( gz ) { gzFile * gzHolder = ( gzFile * ) hb_gcAllocate( sizeof( gzFile ), diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index c51e430708..9aa471b20e 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -5109,8 +5109,8 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) OutStd( cCommand + _OUT_EOL ) ENDIF - IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp := hb_processRun( cCommand ) ) != 0 - hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Running Harbour compiler. %1$s" ), hb_ntos( tmp ) ) ) + IF ! hbmk[ _HBMK_lDONTEXEC ] .AND. ( tmp1 := hb_processRun( cCommand ) ) != 0 + hbmk_OutErr( hbmk, hb_StrFormat( I_( "Error: Running Harbour compiler. %1$s" ), hb_ntos( tmp1 ) ) ) IF ! hbmk[ _HBMK_lQuiet ] OutErr( cCommand + _OUT_EOL ) ENDIF