From 804002c0b7269bc535ba5f235ba4fe7516655901 Mon Sep 17 00:00:00 2001 From: Miguel Angel Marchuet Frutos Date: Fri, 2 Nov 2007 15:15:15 +0000 Subject: [PATCH] 2007-11-02 16:04 UTC+0100 Miguel Angel Marchuet Frutos * contrib/bmdbfcdx/bmdbfcdx1.c ! fixed undoing previous fix --- harbour/ChangeLog | 4 ++++ harbour/contrib/bmdbfcdx/bmdbfcdx1.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index da93d73f6a..a6be2a9a9c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,10 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-11-02 16:04 UTC+0100 Miguel Angel Marchuet Frutos + * contrib/bmdbfcdx/bmdbfcdx1.c + ! fixed undoing previous fix + 2007-11-02 13:15 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) - doc/genhtm.cmd - utils/hbtest/make_xpp.cmd diff --git a/harbour/contrib/bmdbfcdx/bmdbfcdx1.c b/harbour/contrib/bmdbfcdx/bmdbfcdx1.c index a60daf485d..69c5de6293 100644 --- a/harbour/contrib/bmdbfcdx/bmdbfcdx1.c +++ b/harbour/contrib/bmdbfcdx/bmdbfcdx1.c @@ -6902,7 +6902,7 @@ HB_FUNC( BM_DBSEEKWILD ) if( !ISNIL( 1 ) ) { pKey = hb_param( 1, HB_IT_ANY ); - bSoftSeek = ISLOG( 2 ) ? (BOOL) hb_parl( 2 ) : hb_set.HB_SET_SOFTSEEK; + bSoftSeek = ISLOG( 2 ) ? (BOOL) hb_parl( 2 ) : hb_setGetL( HB_SET_SOFTSEEK ); bFindLast = ISLOG( 3 ) ? hb_parl( 3 ) : FALSE; bNext = ISLOG( 4 ) ? hb_parl( 4 ) : FALSE; bAll = ISLOG( 5 ) ? hb_parl( 5 ) : FALSE; @@ -7024,7 +7024,7 @@ static ERRCODE hb_cdxSkipFilter( CDXAREAP pArea, LONG lUpDown ) HB_TRACE(HB_TR_DEBUG, ("hb_cdxSkipFilter(%p, %ld)", pArea, lUpDown)); - if( !hb_set.HB_SET_DELETED && pArea->dbfi.itmCobExpr == NULL ) + if( !hb_setGetL( HB_SET_DELETED ) && pArea->dbfi.itmCobExpr == NULL ) return SUCCESS; /* Since lToSkip is passed to SkipRaw, it should never request more than @@ -7040,7 +7040,7 @@ static ERRCODE hb_cdxSkipFilter( CDXAREAP pArea, LONG lUpDown ) while( !pArea->fBof && !pArea->fEof ) { /* SET DELETED */ - if( hb_set.HB_SET_DELETED ) + if( hb_setGetL( HB_SET_DELETED ) ) { LPCDXTAG pTag = hb_cdxGetActiveTag( pArea ); @@ -9094,7 +9094,7 @@ static ERRCODE hb_cdxSetFilter( CDXAREAP pArea, LPDBFILTERINFO pFilterInfo ) if ( SUPER_SETFILTER( ( AREAP ) pArea, pFilterInfo ) != SUCCESS ) return FAILURE; - pArea->dbfi.fOptimized = hb_set.HB_SET_OPTIMIZE; + pArea->dbfi.fOptimized = hb_setGetL( HB_SET_OPTIMIZE ); if ( pArea->dbfi.fOptimized ) {