From f0de048177e341bff6cdb412ebf781cb9c993c85 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Wed, 3 Nov 2010 22:24:18 +0000 Subject: [PATCH] 2010-11-03 23:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/Makefile + added missing hblpp.ch file * harbour/src/pp/ppcore.c % removed redundant fBinary paramater from hb_pp_pragmaStreamFile() --- harbour/ChangeLog | 7 +++++++ harbour/include/Makefile | 1 + harbour/src/pp/ppcore.c | 11 ++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 05aba0c1ea..6e2ada5013 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2010-11-03 23:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/include/Makefile + + added missing hblpp.ch file + + * harbour/src/pp/ppcore.c + % removed redundant fBinary paramater from hb_pp_pragmaStreamFile() + 2010-11-03 19:36 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/compiler/hbmain.c ! fixed very old bug which can be exploited in some seldom cases, diff --git a/harbour/include/Makefile b/harbour/include/Makefile index 994947b026..7e99fa4ace 100644 --- a/harbour/include/Makefile +++ b/harbour/include/Makefile @@ -118,6 +118,7 @@ PRG_HEADERS := \ hbhrb.ch \ hbinkey.ch \ hblang.ch \ + hblpp.ch \ hbmacro.ch \ hbmath.ch \ hbmemory.ch \ diff --git a/harbour/src/pp/ppcore.c b/harbour/src/pp/ppcore.c index 5ff761fdc1..cb8a9c01e6 100644 --- a/harbour/src/pp/ppcore.c +++ b/harbour/src/pp/ppcore.c @@ -2140,10 +2140,11 @@ static HB_BOOL hb_pp_pragmaStream( PHB_PP_STATE pState, PHB_PP_TOKEN pToken ) #define MAX_STREAM_SIZE 0x1000000 -static void hb_pp_pragmaStreamFile( PHB_PP_STATE pState, const char * szFileName, HB_BOOL fBinary ) +static void hb_pp_pragmaStreamFile( PHB_PP_STATE pState, const char * szFileName ) { PHB_PP_FILE pFile = hb_pp_FileNew( pState, szFileName, HB_FALSE, NULL, NULL, - HB_TRUE, pState->pOpenFunc, fBinary ); + HB_TRUE, pState->pOpenFunc, + pState->iStreamDump == HB_PP_STREAM_BINARY ); if( pFile ) { HB_SIZE nSize; @@ -2502,7 +2503,7 @@ static void hb_pp_pragmaNew( PHB_PP_STATE pState, PHB_PP_TOKEN pToken ) if( !fError && !pState->iCondCompile ) { pState->iStreamDump = HB_PP_STREAM_PRG; - hb_pp_pragmaStreamFile( pState, pToken->pNext->value, HB_FALSE ); + hb_pp_pragmaStreamFile( pState, pToken->pNext->value ); pState->iStreamDump = HB_PP_STREAM_OFF; } } @@ -2517,7 +2518,7 @@ static void hb_pp_pragmaNew( PHB_PP_STATE pState, PHB_PP_TOKEN pToken ) if( !fError && !pState->iCondCompile ) { pState->iStreamDump = HB_PP_STREAM_C; - hb_pp_pragmaStreamFile( pState, pToken->pNext->value, HB_FALSE ); + hb_pp_pragmaStreamFile( pState, pToken->pNext->value ); pState->iStreamDump = HB_PP_STREAM_OFF; } } @@ -2532,7 +2533,7 @@ static void hb_pp_pragmaNew( PHB_PP_STATE pState, PHB_PP_TOKEN pToken ) if( !fError && !pState->iCondCompile ) { pState->iStreamDump = HB_PP_STREAM_BINARY; - hb_pp_pragmaStreamFile( pState, pToken->pNext->value, HB_TRUE ); + hb_pp_pragmaStreamFile( pState, pToken->pNext->value ); pState->iStreamDump = HB_PP_STREAM_OFF; } }