From e03dbb75d674156325e9fe1dedeb4de2baa8315e Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Fri, 4 Mar 2011 10:31:18 +0000 Subject: [PATCH] 2011-03-04 11:31 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/pp/pplib.c * updated function description * harbour/src/pp/pplib3.c * covered old long time obsolete functions: __PPADDRULE(), __PREPROCESS(), __PP_FREE() by HB_LEGACY_LEVEL3 macro --- harbour/ChangeLog | 9 +++++++++ harbour/src/pp/pplib.c | 10 +++++----- harbour/src/pp/pplib3.c | 4 ++++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9e01051485..199695270e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-04 11:31 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/src/pp/pplib.c + * updated function description + + * harbour/src/pp/pplib3.c + * covered old long time obsolete functions: + __PPADDRULE(), __PREPROCESS(), __PP_FREE() + by HB_LEGACY_LEVEL3 macro + 2011-03-04 00:14 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbmzip/3rd/minizip/ioapi.h ! Fixed high chars resulting from copy/pasting from e-mail msg. diff --git a/harbour/src/pp/pplib.c b/harbour/src/pp/pplib.c index 3e9d2142c8..893d413668 100644 --- a/harbour/src/pp/pplib.c +++ b/harbour/src/pp/pplib.c @@ -154,7 +154,7 @@ PHB_PP_STATE hb_pp_Param( int iParam ) /* * initialize new PP context and return pointer to it. - * __PP_INIT( [], [ ] [, ] ) + * __PP_INIT( [], [ ] [, ] ) -> * when is empty string ("") then no default rules are used * only the dynamically created #defines like __HARBOUR__, __DATE__, __TIME__ */ @@ -165,7 +165,7 @@ HB_FUNC( __PP_INIT ) if( pState ) { const char * szPath = hb_parc( 1 ), * szStdCh = hb_parc( 2 ); - HB_BOOL fArchDefs = ! HB_ISLOG( 3 ) || hb_parl( 3 ); + HB_BOOL fArchDefs = hb_parldef( 3, 1 ); PHB_ITEM ppItem; pStatePtr = ( PHB_PP_STATE * ) hb_gcAllocate( sizeof( PHB_PP_STATE ), @@ -196,7 +196,7 @@ HB_FUNC( __PP_INIT ) /* * add new (or replace previous) include paths. - * __PP_PATH( , [, ] ) + * __PP_PATH( , [, ] ) -> NIL */ HB_FUNC( __PP_PATH ) { @@ -208,7 +208,7 @@ HB_FUNC( __PP_PATH ) /* * reset the PP context (remove all rules added by user or preprocessed code) - * __PP_RESET( ) + * __PP_RESET( ) -> NIL */ HB_FUNC( __PP_RESET ) { @@ -220,7 +220,7 @@ HB_FUNC( __PP_RESET ) /* * preprocess and execute new preprocessor directive - * __PPADDRULE( , ) + * __PP_ADDRULE( , ) -> */ HB_FUNC( __PP_ADDRULE ) { diff --git a/harbour/src/pp/pplib3.c b/harbour/src/pp/pplib3.c index f288233e82..6fe89d57bd 100644 --- a/harbour/src/pp/pplib3.c +++ b/harbour/src/pp/pplib3.c @@ -55,6 +55,8 @@ #include "hbvm.h" #include "hbinit.h" +#ifdef HB_LEGACY_LEVEL3 + HB_FUNC_EXTERN( __PP_INIT ); HB_FUNC_EXTERN( __PP_ADDRULE ); HB_FUNC_EXTERN( __PP_PROCESS ); @@ -152,3 +154,5 @@ HB_FUNC( __PP_FREE ) s_pp = NULL; } } + +#endif /* HB_LEGACY_LEVEL3 */