diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7f2cfc9b4d..7ddedf39a5 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-17 10:32 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * src/rtl/errapi.c + * src/rtl/philes.c + * src/rtl/dirdrive.c + * contrib/hbnf/fttext.c + * Changed back long versions of Harbour APIs to int version. + It was an oversight. + 2009-11-17 04:26 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/xhb/xhbfunc.c + Ported CURDIRX() function from xhb. @@ -770,7 +778,7 @@ * config/win/bcc.mk + Changed to use ilink32 directly to link executables instead of relying on bcc32. - This changed synced this details with hbmk2. + This change synced this details with hbmk2. Please test, especially on Linux+Wine. Also please don't hesitate to make adjustments to this change if needed. BCC isn't my bread and butter and I didn't make @@ -797,7 +805,7 @@ 2009-11-14 18:08 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/hbi18n1.c + Added plural form support for these languages: - CS, FR, GA, HR, HU, JA, KO, LV, PT-BR, RO, SK, SL, SR, TR, UK, VI + CS, FR, GA, HR, JA, KO, LV, PT-BR, RO, SK, SL, SR, TR, UK, VI * src/rtl/cputime.c * Minor formatting. diff --git a/harbour/contrib/hbnf/fttext.c b/harbour/contrib/hbnf/fttext.c index 0262623eaa..5d56535fcf 100644 --- a/harbour/contrib/hbnf/fttext.c +++ b/harbour/contrib/hbnf/fttext.c @@ -518,7 +518,7 @@ HB_FUNC( FT_FGOTOP ) HB_FUNC( FT_FERROR ) { - hb_retnl( error[area] ); + hb_retni( error[area] ); } diff --git a/harbour/src/rtl/dirdrive.c b/harbour/src/rtl/dirdrive.c index 5a98dad68d..343054e3aa 100644 --- a/harbour/src/rtl/dirdrive.c +++ b/harbour/src/rtl/dirdrive.c @@ -60,9 +60,9 @@ HB_FUNC( DIRCHANGE ) { if( HB_ISCHAR( 1 ) ) - hb_retnl( hb_fsChDir( hb_parc( 1 ) ) ? 0 : hb_fsError() ); + hb_retni( hb_fsChDir( hb_parc( 1 ) ) ? 0 : hb_fsError() ); else - hb_retnl( F_ERROR ); + hb_retni( F_ERROR ); } /* NOTE: Clipper 5.3 NG incorrectly states that the name of this function is @@ -71,17 +71,17 @@ HB_FUNC( DIRCHANGE ) HB_FUNC( MAKEDIR ) { if( HB_ISCHAR( 1 ) ) - hb_retnl( hb_fsMkDir( hb_parc( 1 ) ) ? 0 : hb_fsError() ); + hb_retni( hb_fsMkDir( hb_parc( 1 ) ) ? 0 : hb_fsError() ); else - hb_retnl( F_ERROR ); + hb_retni( F_ERROR ); } HB_FUNC( DIRREMOVE ) { if( HB_ISCHAR( 1 ) ) - hb_retnl( hb_fsRmDir( hb_parc( 1 ) ) ? 0 : hb_fsError() ); + hb_retni( hb_fsRmDir( hb_parc( 1 ) ) ? 0 : hb_fsError() ); else - hb_retnl( F_ERROR ); + hb_retni( F_ERROR ); } /* NOTE: Clipper 5.3 undocumented */ diff --git a/harbour/src/rtl/errapi.c b/harbour/src/rtl/errapi.c index 6f017d6115..da85558b53 100644 --- a/harbour/src/rtl/errapi.c +++ b/harbour/src/rtl/errapi.c @@ -325,7 +325,7 @@ HB_FUNC_STATIC( _SUBSYSTEM ) HB_FUNC_STATIC( GENCODE ) { - hb_retnl( hb_errGetGenCode( hb_stackSelfItem() ) ); + hb_retni( hb_errGetGenCode( hb_stackSelfItem() ) ); } HB_FUNC_STATIC( _GENCODE ) @@ -339,13 +339,13 @@ HB_FUNC_STATIC( _GENCODE ) hb_langDGetErrorDesc( iValue ) ); } - hb_retnl( iValue ); + hb_retni( iValue ); } HB_FUNC_STATIC( OSCODE ) { - hb_retnl( hb_errGetOsCode( hb_stackSelfItem() ) ); + hb_retni( hb_errGetOsCode( hb_stackSelfItem() ) ); } HB_FUNC_STATIC( _OSCODE ) @@ -355,13 +355,13 @@ HB_FUNC_STATIC( _OSCODE ) if( hb_errGetNumCode( &iValue, "OSCODE" ) ) hb_errPutOsCode( hb_stackSelfItem(), ( HB_ERRCODE ) iValue ); - hb_retnl( iValue ); + hb_retni( iValue ); } HB_FUNC_STATIC( SUBCODE ) { - hb_retnl( hb_errGetSubCode( hb_stackSelfItem() ) ); + hb_retni( hb_errGetSubCode( hb_stackSelfItem() ) ); } HB_FUNC_STATIC( _SUBCODE ) @@ -371,7 +371,7 @@ HB_FUNC_STATIC( _SUBCODE ) if( hb_errGetNumCode( &iValue, "SUBCODE" ) ) hb_errPutSubCode( hb_stackSelfItem(), ( HB_ERRCODE ) iValue ); - hb_retnl( iValue ); + hb_retni( iValue ); } @@ -772,14 +772,14 @@ HB_ERRCODE hb_errGetGenCode( PHB_ITEM pError ) { HB_TRACE(HB_TR_DEBUG, ("hb_errGetGenCode(%p)", pError)); - return ( HB_ERRCODE ) hb_arrayGetNL( pError, HB_TERROR_GENCODE ); + return ( HB_ERRCODE ) hb_arrayGetNI( pError, HB_TERROR_GENCODE ); } PHB_ITEM hb_errPutGenCode( PHB_ITEM pError, HB_ERRCODE uiGenCode ) { HB_TRACE(HB_TR_DEBUG, ("hb_errPutGenCode(%p, %hu)", pError, uiGenCode)); - hb_arraySetNL( pError, HB_TERROR_GENCODE, uiGenCode ); + hb_arraySetNI( pError, HB_TERROR_GENCODE, uiGenCode ); return pError; } @@ -811,14 +811,14 @@ HB_ERRCODE hb_errGetOsCode( PHB_ITEM pError ) { HB_TRACE(HB_TR_DEBUG, ("hb_errGetOsCode(%p)", pError)); - return ( HB_ERRCODE ) hb_arrayGetNL( pError, HB_TERROR_OSCODE ); + return ( HB_ERRCODE ) hb_arrayGetNI( pError, HB_TERROR_OSCODE ); } PHB_ITEM hb_errPutOsCode( PHB_ITEM pError, HB_ERRCODE uiOsCode ) { HB_TRACE(HB_TR_DEBUG, ("hb_errPutOsCode(%p, %hu)", pError, uiOsCode)); - hb_arraySetNL( pError, HB_TERROR_OSCODE, uiOsCode ); + hb_arraySetNI( pError, HB_TERROR_OSCODE, uiOsCode ); return pError; } @@ -843,14 +843,14 @@ HB_ERRCODE hb_errGetSubCode( PHB_ITEM pError ) { HB_TRACE(HB_TR_DEBUG, ("hb_errGetSubCode(%p)", pError)); - return ( HB_ERRCODE ) hb_arrayGetNL( pError, HB_TERROR_SUBCODE ); + return ( HB_ERRCODE ) hb_arrayGetNI( pError, HB_TERROR_SUBCODE ); } PHB_ITEM hb_errPutSubCode( PHB_ITEM pError, HB_ERRCODE uiSubCode ) { HB_TRACE(HB_TR_DEBUG, ("hb_errPutSubCode(%p, %hu)", pError, uiSubCode)); - hb_arraySetNL( pError, HB_TERROR_SUBCODE, uiSubCode ); + hb_arraySetNI( pError, HB_TERROR_SUBCODE, uiSubCode ); return pError; } @@ -1029,8 +1029,8 @@ PHB_ITEM hb_errRT_FileError( PHB_ITEM pError, const char * szSubSystem, HB_FUNC( __ERRRT_BASE ) { - hb_errRT_BASE( ( HB_ERRCODE ) hb_parnl( 1 ), - ( HB_ERRCODE ) hb_parnl( 2 ), + hb_errRT_BASE( ( HB_ERRCODE ) hb_parni( 1 ), + ( HB_ERRCODE ) hb_parni( 2 ), hb_parc( 3 ), hb_parc( 4 ), ( hb_pcount() > 5 && hb_parnl( 5 ) > 0 ? 1 : 0 ), @@ -1039,8 +1039,8 @@ HB_FUNC( __ERRRT_BASE ) HB_FUNC( __ERRRT_SBASE ) { - hb_errRT_BASE_SubstR( ( HB_ERRCODE ) hb_parnl( 1 ), - ( HB_ERRCODE ) hb_parnl( 2 ), + hb_errRT_BASE_SubstR( ( HB_ERRCODE ) hb_parni( 1 ), + ( HB_ERRCODE ) hb_parni( 2 ), hb_parc( 3 ), hb_parc( 4 ), ( hb_pcount() > 5 && hb_parnl( 5 ) > 0 ? 1 : 0 ), diff --git a/harbour/src/rtl/philes.c b/harbour/src/rtl/philes.c index fcb0c661b9..c70cf0b83a 100644 --- a/harbour/src/rtl/philes.c +++ b/harbour/src/rtl/philes.c @@ -419,7 +419,7 @@ HB_FUNC( HB_FGETDATETIME ) HB_FUNC( HB_OSERROR ) { - hb_retnl( hb_fsOsError() ); + hb_retni( hb_fsOsError() ); } HB_FUNC( HB_OSPATHSEPARATOR )