diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8423a6ce86..0d481c873b 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,14 @@ +20000413-12:14 GMT+1 Victor Szakats + + * include/hbver.h + * Date bumped to indicate new pcode revision. + + * include/hbapi.h + ! Fix for HB_EXTEND_API_MACROS + + * source/rdd/dbstrux.prg + ! Small formatting. + 20000413-01:30 GMT-8 Ron Pinkas * source/include/hbpcode.h diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index 0df382136b..649836c47b 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -271,6 +271,8 @@ extern PHB_ITEM hb_param( int iParam, int iMask ); /* retrieve a generic paramet #ifdef HB_EXTEND_API_MACROS +#include "hbapiitm.h" + #define hb_pcount() ( ( int ) hb_stack.pBase->item.asSymbol.paramcnt ) #define hb_ret() hb_itemClear( &hb_stack.Return ) diff --git a/harbour/include/hbver.h b/harbour/include/hbver.h index c780c1556d..571cb5037b 100644 --- a/harbour/include/hbver.h +++ b/harbour/include/hbver.h @@ -42,6 +42,6 @@ #define HB_VER_BUILD 33 /* Build number */ #define HB_VER_YEAR 2000 /* Build year */ #define HB_VER_MONTH 04 /* Build month */ -#define HB_VER_DAY 07 /* Build day */ +#define HB_VER_DAY 14 /* Build day */ #endif /* HB_VER_H_ */ diff --git a/harbour/source/rdd/dbstrux.prg b/harbour/source/rdd/dbstrux.prg index fbd46911ab..a5a227ab6a 100644 --- a/harbour/source/rdd/dbstrux.prg +++ b/harbour/source/rdd/dbstrux.prg @@ -159,7 +159,7 @@ FUNCTION __dbStructFilter( aStruct, aFieldList ) aStructFiltered := {} bFindName := {| aField | aField[ DBS_NAME ] == RTrim( Upper(cName ) ) } - aEval( aFieldList, {| cFieldName, nIndex | cName := cFieldName,nIndex := aScan( aStruct, bFindName ),; + aEval( aFieldList, {| cFieldName, nIndex | cName := cFieldName, nIndex := aScan( aStruct, bFindName ),; iif( nIndex == 0, NIL, aAdd( aStructFiltered, aStruct[ nIndex] ) ) } ) RETURN aStructFiltered