fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2010-11-03 23:24 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/include/Makefile
    + added missing hblpp.ch file

  * harbour/src/pp/ppcore.c
    % removed redundant fBinary paramater from hb_pp_pragmaStreamFile()
This commit is contained in:
Przemyslaw Czerpak
2010-11-03 22:24:18 +00:00
parent 8521154cfb
commit f0de048177
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -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,

1
harbour/include/Makefile
View File

@@ -118,6 +118,7 @@ PRG_HEADERS := \
hbhrb.ch \
hbinkey.ch \
hblang.ch \
hblpp.ch \
hbmacro.ch \
hbmath.ch \
hbmemory.ch \

11
harbour/src/pp/ppcore.c
View File

@@ -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;
}
}