diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3d18af97ce..c5d947d5ac 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,13 @@ 2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2008-10-27 18:38 UTC+0200 Viktor Szakats (harbour.01 syenar hu) + * source/pp/ppcore.c + - Removed duplicate TEXTHIDDEN #pragma implementation. + + * source/vm/arrayshb.c + * Reset defaults of last parameters of hb_AINS()/hb_ADEL(). + 2008-10-27 18:05 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbdefs.h + added HB_PRINTF_FORMAT() macro to declare functions with printf() diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index fd86f79441..0d6196560a 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -2383,14 +2383,6 @@ static void hb_pp_pragmaNew( PHB_PP_STATE pState, PHB_PP_TOKEN pToken ) else fError = TRUE; } - else if( hb_pp_tokenValueCmp( pToken, "TEXTHIDDEN", HB_PP_CMP_DBASE ) ) - { - pValue = hb_pp_pragmaGetLogical( pToken->pNext, &fValue ); - if( pValue ) - fError = hb_pp_setCompilerSwitch( pState, "texthidden", ( int ) fValue ); - else - fError = TRUE; - } else if( hb_pp_tokenValueCmp( pToken, "DYNAMICMEMVAR", HB_PP_CMP_DBASE ) ) { pValue = hb_pp_pragmaGetLogical( pToken->pNext, &fValue ); diff --git a/harbour/source/vm/arrayshb.c b/harbour/source/vm/arrayshb.c index 6b2cbc6faa..41338d4fda 100644 --- a/harbour/source/vm/arrayshb.c +++ b/harbour/source/vm/arrayshb.c @@ -318,7 +318,7 @@ HB_FUNC( HB_AINS ) if( lPos == 0 ) lPos = 1; - if( ! ISLOG( 4 ) || hb_parl( 4 ) ) + if( ISLOG( 4 ) && hb_parl( 4 ) ) { ULONG ulLen = hb_arrayLen( pArray ) + 1; if( lPos >= 1 && ( ULONG ) lPos <= ulLen ) @@ -348,7 +348,7 @@ HB_FUNC( HB_ADEL ) if( hb_arrayDel( pArray, lPos ) ) { - if( ! ISLOG( 3 ) || hb_parl( 3 ) ) + if( ISLOG( 3 ) && hb_parl( 3 ) ) hb_arraySize( pArray, hb_arrayLen( pArray ) - 1 ); }