From 3ad80020bfb6ff79bcf000bcd46adafb2824dad5 Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Wed, 8 Nov 2000 22:10:48 +0000 Subject: [PATCH] 2000-11-08 24:10 UTC+0800 Ron Pinkas * source/compiler/cmdcheck.c * utils/hbpp/hbpp.c + Added missing type case for C++ compilers. * source/compiler/simplex.c * Added 1 missing var reset. --- harbour/ChangeLog | 8 ++++++++ harbour/source/compiler/cmdcheck.c | 2 +- harbour/source/compiler/simplex.c | 2 +- harbour/utils/hbpp/hbpp.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7306793368..98012f6b8d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,11 @@ +2000-11-08 24:10 UTC+0800 Ron Pinkas + * source/compiler/cmdcheck.c + * utils/hbpp/hbpp.c + + Added missing type case for C++ compilers. + + * source/compiler/simplex.c + * Added 1 missing var reset. + 2000-11-08 11:28 UTC+0800 Brian Hays * source\vm\arrays.c * added Victor's fix for passing the second parameter to ascan's codeblock. diff --git a/harbour/source/compiler/cmdcheck.c b/harbour/source/compiler/cmdcheck.c index b82c79ced4..a4180a789d 100644 --- a/harbour/source/compiler/cmdcheck.c +++ b/harbour/source/compiler/cmdcheck.c @@ -788,7 +788,7 @@ static void hb_compChkDefineSwitch( char * pszSwitch ) szDefText[ pAssign - szDefText ] = '\0'; //hb_pp_AddDefine( szDefText, pAssign + 1 ); - sDefLine = hb_xgrab( strlen( szDefText ) + 1 + strlen( pAssign + 1 ) + 1 ); + sDefLine = (char*) hb_xgrab( strlen( szDefText ) + 1 + strlen( pAssign + 1 ) + 1 ); sprintf( sDefLine, "%s %s", szDefText, pAssign + 1 ); hb_pp_ParseDefine( sDefLine ); hb_xfree( sDefLine ); diff --git a/harbour/source/compiler/simplex.c b/harbour/source/compiler/simplex.c index 4e9d90975c..47750d319f 100644 --- a/harbour/source/compiler/simplex.c +++ b/harbour/source/compiler/simplex.c @@ -1347,7 +1347,7 @@ void SimpLex_CheckWords( void ) if( s_szBuffer != szBaseBuffer ) { - s_szBuffer = szBaseBuffer; iSize = iBaseSize; iHold = 0; iReturn = 0; + s_szBuffer = szBaseBuffer; iSize = iBaseSize; iHold = 0; iReturn = 0; iPairToken = 0; DEBUG_INFO( printf( "Partial Match - Restored position: %i at: [%s]\n", iSize, s_szBuffer ) ); } diff --git a/harbour/utils/hbpp/hbpp.c b/harbour/utils/hbpp/hbpp.c index 931f0d8918..1033216ba4 100644 --- a/harbour/utils/hbpp/hbpp.c +++ b/harbour/utils/hbpp/hbpp.c @@ -129,7 +129,7 @@ int main( int argc, char * argv[] ) szDefText[ pAssign - szDefText ] = '\0'; //hb_pp_AddDefine( szDefText, pAssign + 1 ); - sDefLine = hb_xgrab( strlen( szDefText ) + 1 + strlen( pAssign + 1 ) + 1 ); + sDefLine = (char*) hb_xgrab( strlen( szDefText ) + 1 + strlen( pAssign + 1 ) + 1 ); sprintf( sDefLine, "%s %s", szDefText, pAssign + 1 ); hb_pp_ParseDefine( sDefLine ); hb_xfree( sDefLine );