From 6256ccc4be5ef1505c16832ef7c875271c279f07 Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 7 Oct 2010 08:21:20 +0000 Subject: [PATCH] 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. --- harbour/ChangeLog | 7 +++++++ harbour/src/compiler/hbmain.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 3661b7ef92..8f51ac8c19 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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. diff --git a/harbour/src/compiler/hbmain.c b/harbour/src/compiler/hbmain.c index d8b13c7a11..1a33530b2d 100644 --- a/harbour/src/compiler/hbmain.c +++ b/harbour/src/compiler/hbmain.c @@ -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 )