From d01a60762538dca339533de46d0d9aa5f06d1803 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 7 Jul 2010 17:03:33 +0000 Subject: [PATCH] 2010-07-07 19:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/pp/ppcore.c ! Extended one variable type to HB_ISIZ from int after latest PP modifications. Shown by msvc64. --- harbour/ChangeLog | 5 +++++ harbour/src/pp/ppcore.c | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index cfb09ae5fa..bc2444d63c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,11 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-07 19:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * src/pp/ppcore.c + ! Extended one variable type to HB_ISIZ from int after + latest PP modifications. Shown by msvc64. + 2010-07-07 18:53 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/vm/macro.c ! Added missing renames from prev session. diff --git a/harbour/src/pp/ppcore.c b/harbour/src/pp/ppcore.c index 62a2b0962d..a65e1fa15d 100644 --- a/harbour/src/pp/ppcore.c +++ b/harbour/src/pp/ppcore.c @@ -1510,21 +1510,22 @@ static void hb_pp_getLine( PHB_PP_STATE pState ) static int hb_pp_tokenStr( PHB_PP_TOKEN pToken, PHB_MEM_BUFFER pBuffer, HB_BOOL fSpaces, HB_BOOL fQuote, HB_USHORT ltype ) { - int iLines = 0, iSpace = fSpaces ? pToken->spaces : 0; + int iLines = 0; + HB_ISIZ nSpace = fSpaces ? pToken->spaces : 0; /* This is workaround for stringify token list and later decoding by FLEX which breaks Clipper compatible code */ - if( iSpace == 0 && fQuote && ltype && + if( nSpace == 0 && fQuote && ltype && ltype >= HB_PP_TOKEN_ASSIGN && ltype != HB_PP_TOKEN_EQ && HB_PP_TOKEN_TYPE( pToken->type ) >= HB_PP_TOKEN_ASSIGN && HB_PP_TOKEN_TYPE( pToken->type ) != HB_PP_TOKEN_EQ ) - iSpace = 1; + nSpace = 1; - if( iSpace > 0 ) + if( nSpace > 0 ) { do hb_membufAddCh( pBuffer, ' ' ); - while( --iSpace ); + while( --nSpace ); } if( HB_PP_TOKEN_TYPE( pToken->type ) == HB_PP_TOKEN_STRING )