From e2d717420145e125edb7732d495e0dce3c7a3d81 Mon Sep 17 00:00:00 2001 From: "David G. Holm" Date: Mon, 2 Oct 2000 17:05:19 +0000 Subject: [PATCH] See ChangeLog entry 2000-10-02 12:45 UTC-0400 David G. Holm --- harbour/ChangeLog | 5 +++++ harbour/source/pp/ppcore.c | 6 +----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index fd153a1944..6d97d19ecf 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,8 @@ +2000-10-02 12:45 UTC-0400 David G. Holm + * source/pp/ppcore.c + ! The include file limit check now uses hb_comp_files.iFiles + instead of the static variable that never got decremented. + 2000-10-01 18:25 GMT+2 Maurilio Longo *source/rtl/tbrowse.prg ! PageDown() and GoBottom() methods weren't working when number of available record was lower than diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index a932643ca0..9f648bb4e8 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -148,7 +148,6 @@ static BOOL s_bReplacePat; static int s_numBrackets; static char s_groupchar; static char s_prevchar; -static int s_iIncludes = 0; int hb_pp_nEmptyStrings; int * hb_pp_aCondCompile = NULL; @@ -337,7 +336,6 @@ void hb_pp_Init( void ) s_maxCondCompile = 5; s_bReplacePat = TRUE; s_prevchar = 'A'; - s_iIncludes = 0; if( !hb_pp_aCondCompile ) hb_pp_aCondCompile = ( int * ) hb_xgrab( sizeof( int ) * 5 ); @@ -2940,10 +2938,8 @@ static BOOL OpenInclude( char * szFileName, PATHNAMES * pSearch, PHB_FNAME pMain HB_TRACE(HB_TR_DEBUG, ("OpenInclude(%s, %p, %p, %p, %d)", szFileName, pSearch, pMainFileName, fptr, (int) bStandardOnly)); - if( s_iIncludes > HB_PP_MAX_INCLUDES ) + if( hb_comp_files.iFiles >= HB_PP_MAX_INCLUDES ) hb_compGenError( hb_pp_szErrors, 'F', HB_PP_ERR_TOO_MANY_INCLUDES, szFileName, NULL ); - else - s_iIncludes++; if( bStandardOnly ) {