diff --git a/ChangeLog.txt b/ChangeLog.txt index ea202e2aea..57362d89f2 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -10,6 +10,11 @@ * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment */ +2015-06-25 16:25 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) + * src/pp/ppcore.c + ! fixed compilation of initial files passed without path + (broken by mistake in recent modifications) + 2015-06-25 13:49 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl) * src/pp/ppcore.c ! restored previous algorithm for scanning #included files when included diff --git a/src/pp/ppcore.c b/src/pp/ppcore.c index 1998e1fb01..eb6fb19653 100644 --- a/src/pp/ppcore.c +++ b/src/pp/ppcore.c @@ -1977,10 +1977,11 @@ static PHB_PP_FILE hb_pp_FileNew( PHB_PP_STATE pState, const char * szFileName, PHB_FNAME pFirstFName = hb_fsFNameSplit( szFirstFName ); pFileName->szPath = pFirstFName->szPath; hb_fsFNameMerge( szFileNameBuf, pFileName ); - szFileName = szFileNameBuf; - file_in = hb_fopen( szFileName, fBinary ? "rb" : "r" ); hb_xfree( pFirstFName ); + szFileName = szFileNameBuf; } + if( ! pFileName->szPath || szFirstFName ) + file_in = hb_fopen( szFileName, fBinary ? "rb" : "r" ); } if( file_in ) iAction = HB_PP_OPEN_OK;