diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c728190c07..faaf65ae0e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,18 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-09 23:05 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * source/compiler/hbusage.c + + Added -u+ to help screen. + * One remaining non-ASCII char cleaned from credit list. + + * include/hbpp.h + * source/pp/ppcore.c + ! Renamed HB_PP_MAX_REPATS to HB_PP_MAX_REPEATS. + + * ChangeLog + * Added one line to my prev entry. + 2009-03-09 17:16 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbcompdf.h * harbour/source/compiler/cmdcheck.c @@ -29,6 +41,7 @@ * make_gnu_os2.cmd * make_gnu.bat + Clearing HARBOUR/CLIPPER envvars while building Harbour. + * bcc32 no longer accepted as compatibility HB_COMPILER value. * utils/hbmk2/hbmk2.prg * TODO section update. diff --git a/harbour/include/hbpp.h b/harbour/include/hbpp.h index bc6b605d96..3397f52960 100644 --- a/harbour/include/hbpp.h +++ b/harbour/include/hbpp.h @@ -395,7 +395,7 @@ HB_PP_TOKEN, * PHB_PP_TOKEN; /* maximum number of single token translations, in Clipper it's 18 + number of used rules, we will use also constant but increased by total number of rules of given type: define, [x]translate, [x]command */ -#define HB_PP_MAX_REPATS 128 +#define HB_PP_MAX_REPEATS 128 /* Clipper allows only 16 nested includes */ #define HB_PP_MAX_INCLUDED_FILES 64 diff --git a/harbour/source/compiler/hbusage.c b/harbour/source/compiler/hbusage.c index 4ad8b27634..28a0021324 100644 --- a/harbour/source/compiler/hbusage.c +++ b/harbour/source/compiler/hbusage.c @@ -75,7 +75,7 @@ void hb_compPrintUsage( HB_COMP_DECL, const char * szSelf ) "\n 3=generate real C code", #ifdef HB_LEGACY_LEVEL2 "\n %cgo output type: Platform dependant object module", - "\n Deprecated. Please use hbmk2", + "\n (deprecated. Please use hbmk2)", #endif #ifdef HB_GEN_OBJ32 "\n %cgw output type: Windows/DOS OBJ32 (.obj)", @@ -100,6 +100,7 @@ void hb_compPrintUsage( HB_COMP_DECL, const char * szSelf ) "\n %cs syntax check only", /* TODO: "\n %ct path for temp file creation", */ "\n %cu[] use command def set in (or none)", + "\n %cu+[] #include ", "\n %cundef: #undef ", "\n %cv variables are assumed M->", "\n %cw[] set warning level number (0..3, default 1)", @@ -246,7 +247,7 @@ void hb_compPrintCredits( HB_COMP_DECL ) "Ryszard Glab \n" "Teo Fonrouge \n" "Tim Stone \n" - "Tomaž Zupan \n" + "Tomaz Zupan \n" "Vailton Renato \n" "Viktor Szakats \n" "Vladimir Kazimirchik \n" diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index a631ba5250..c559cf3e7e 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -4177,7 +4177,7 @@ static BOOL hb_pp_processDefine( PHB_PP_STATE pState, PHB_PP_TOKEN * pFirstPtr ) hb_pp_patternReplace( pState, pRule, pFirstPtr, "define" ); fSubst = fRepeat = TRUE; if( ++pState->iCycle > pState->iMaxCycles || - ++iCycle > HB_PP_MAX_REPATS + pState->iDefinitions ) + ++iCycle > HB_PP_MAX_REPEATS + pState->iDefinitions ) { pState->iCycle = pState->iMaxCycles + 1; hb_pp_error( pState, 'E', HB_PP_ERR_CYCLIC_DEFINE, pRule->pMatch->value ); @@ -4221,7 +4221,7 @@ static BOOL hb_pp_processTranslate( PHB_PP_STATE pState, PHB_PP_TOKEN * pFirstPt hb_pp_patternReplace( pState, pRule, pTokenPtr, "translate" ); fSubst = fRepeat = TRUE; if( ++pState->iCycle > pState->iMaxCycles || - ++iCycle > HB_PP_MAX_REPATS + pState->iTranslations ) + ++iCycle > HB_PP_MAX_REPEATS + pState->iTranslations ) { pState->iCycle = pState->iMaxCycles + 1; hb_pp_error( pState, 'E', HB_PP_ERR_CYCLIC_TRANSLATE, pRule->pMatch->value ); @@ -4260,7 +4260,7 @@ static BOOL hb_pp_processCommand( PHB_PP_STATE pState, PHB_PP_TOKEN * pFirstPtr hb_pp_patternReplace( pState, pRule, pFirstPtr, "command" ); fSubst = fRepeat = TRUE; if( ++pState->iCycle > pState->iMaxCycles || - ++iCycle > HB_PP_MAX_REPATS + pState->iCommands ) + ++iCycle > HB_PP_MAX_REPEATS + pState->iCommands ) { pState->iCycle = pState->iMaxCycles + 1; hb_pp_error( pState, 'E', HB_PP_ERR_CYCLIC_COMMAND, pRule->pMatch->value );