From e1709d1fffb81d4d2030eea4c132dcb706776665 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Sat, 20 Jun 2009 01:47:28 +0000 Subject: [PATCH] 2009-06-20 03:47 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/vm/runner.c ! fixed possible static function overloading --- harbour/ChangeLog | 4 ++++ harbour/source/vm/runner.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 8fa0872656..0dc48c4be3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,10 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-20 03:47 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/source/vm/runner.c + ! fixed possible static function overloading + 2009-06-19 23:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * utils/hbmk2/hbmk2.prg + .hbl files will be created relative to target executable diff --git a/harbour/source/vm/runner.c b/harbour/source/vm/runner.c index c99d085210..b7e30345ef 100644 --- a/harbour/source/vm/runner.c +++ b/harbour/source/vm/runner.c @@ -495,8 +495,8 @@ static PHRB_BODY hb_hrbLoad( const char * szHrbBody, ULONG ulBodySize, USHORT us { for( ul = 0; ul < pHrbBody->ulSymbols; ul++ ) { - if( pSymRead[ ul ].value.pCodeFunc != ( PHB_PCODEFUNC ) SYM_EXTERN && - ( pSymRead[ ul ].scope.value & HB_FS_LOCAL ) != 0 ) + if( ( pSymRead[ ul ].scope.value & + ( HB_FS_LOCAL | HB_FS_STATIC ) ) == HB_FS_LOCAL ) { pDynSym = hb_dynsymFind( pSymRead[ ul ].szName ); if( pDynSym )