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

2010-10-07 10:21 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/compiler/hbmain.c
    * declare automatically created function in code compiled by
      HB_COMPILEFROMBUF() with -n2 switch as static.
      It eliminates possible conflicts when user tries to register
      in single HVM instance many HRB modules with such startup function.
This commit is contained in:
Przemyslaw Czerpak
2010-10-07 08:21:20 +00:00
parent 2b86932f0b
commit 6256ccc4be
2 changed files with 9 additions and 1 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-10-07 10:21 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/compiler/hbmain.c
* declare automatically created function in code compiled by
HB_COMPILEFROMBUF() with -n2 switch as static.
It eliminates possible conflicts when user tries to register
in single HVM instance many HRB modules with such startup function.
2010-10-06 16:33 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbxbp/xbpwindow.prg
! An important regression fix.

3
harbour/src/compiler/hbmain.c
View File

@@ -4159,7 +4159,8 @@ static int hb_compCompile( HB_COMP_DECL, const char * szPrg, const char * szBuff
* intentionally to not create name conflicts when -n2 switch
* is used and we compile code not encapsulated in function.
*/
hb_compFunctionAdd( HB_COMP_PARAM, "__hbInit", 0, FUN_PROCEDURE | FUN_FILE_FIRST | FUN_FILE_DECL );
hb_compFunctionAdd( HB_COMP_PARAM, "__hbInit", HB_FS_STATIC,
FUN_PROCEDURE | FUN_FILE_FIRST | FUN_FILE_DECL );
else
{
if( ! HB_COMP_PARAM->fQuiet )