diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5671077c4d..38dc44caac 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ + * harbour/source/rdd/dbsort.prg + * harbour/source/rdd/dbstrux.prg + * harbour/source/rtl/dbdelim.prg + * updated for strict Clipper DBCREATE() parameters + +2006-07-13 12:27 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu) + * harbour/source/rtl/hvm.c ! errorlevel changed to int from byte. * harbour/source/rtl/errorapi.c diff --git a/harbour/source/rtl/errorapi.c b/harbour/source/rtl/errorapi.c index a99b82b66d..8365ba29da 100644 --- a/harbour/source/rtl/errorapi.c +++ b/harbour/source/rtl/errorapi.c @@ -230,14 +230,14 @@ USHORT hb_errLaunch( PHB_ITEM pError ) if( usRequest == HB_QUIT_REQUESTED ) { if( pResult ) - hb_itemRelease( pResult ); + hb_itemRelease( pResult ); hb_errRelease( pError ); hb_vmQuit(); } else if( usRequest == HB_BREAK_REQUESTED || usRequest == HB_ENDPROC_REQUESTED ) { if( pResult ) - hb_itemRelease( pResult ); + hb_itemRelease( pResult ); uiAction = E_BREAK; } else if( pResult ) diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 7aac483961..fe986eee40 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -227,7 +227,7 @@ HB_SYMB hb_symEnumValue = { "__ENUMVALUE", {HB_FS_MESSAGE}, {NULL}, NULL }; static HB_ITEM s_aStatics; /* Harbour array to hold all application statics variables */ -static BYTE s_byErrorLevel; /* application exit errorlevel */ +static INT s_nErrorLevel; /* application exit errorlevel */ static PHB_SYMB s_pSymStart = NULL; /* start symbol of the application. MAIN() is not required */ static PHB_SYMBOLS s_pSymbols = NULL; /* to hold a linked list of all different modules symbol tables */ @@ -396,7 +396,7 @@ HB_EXPORT void hb_vmInit( BOOL bStartMainProc ) /* initialize internal data structures */ s_aStatics.type = HB_IT_NIL; - s_byErrorLevel = 0; + s_nErrorLevel = 0; s_bDebugging = FALSE; s_bDebugShowLines = FALSE; s_bDebuggerIsWorking = FALSE; @@ -583,7 +583,7 @@ HB_EXPORT void hb_vmQuit( void ) /* hb_dynsymLog(); */ hb_xexit(); - exit( s_byErrorLevel ); + exit( s_nErrorLevel ); } HB_EXPORT void hb_vmExecute( const BYTE * pCode, PHB_SYMB pSymbols ) @@ -5845,14 +5845,14 @@ void hb_vmForceLink( void ) HB_FUNC( ERRORLEVEL ) { - hb_retni( s_byErrorLevel ); + hb_retni( s_nErrorLevel ); /* NOTE: This should be ISNUM( 1 ), but it's sort of a Clipper bug that it accepts other types also and considers them zero. [vszakats] */ if( hb_pcount() >= 1 ) /* Only replace the error level if a parameter was passed */ - s_byErrorLevel = hb_parni( 1 ); + s_nErrorLevel = hb_parni( 1 ); } void hb_vmRequestQuit( void )