From 515035d9fea3610fc78126e6a49a0992963681bd Mon Sep 17 00:00:00 2001 From: Ron Pinkas Date: Fri, 10 Aug 2001 00:43:13 +0000 Subject: [PATCH] 2001-08-09 17:45 UTC-0800 Ron Pinkas * source/compiler/harbour.c * Minor correction to handling of HB_FS_FIRST * source/vm/hvm.c * Added extern "C" protection to hb_macroAutoSetMacro() declaration. --- harbour/ChangeLog | 7 +++++++ harbour/source/compiler/harbour.c | 2 +- harbour/source/vm/hvm.c | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index c7b1ea9b4e..2e7436b500 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,3 +1,10 @@ +2001-08-09 17:45 UTC-0800 Ron Pinkas + * source/compiler/harbour.c + * Minor correction to handling of HB_FS_FIRST + + * source/vm/hvm.c + * Added extern "C" protection to hb_macroAutoSetMacro() declaration. + 2001-08-08 15:30 UTC-0400 David G. Holm * tests/gtstdtst.prg diff --git a/harbour/source/compiler/harbour.c b/harbour/source/compiler/harbour.c index fcc376b55e..5e6d2d51eb 100644 --- a/harbour/source/compiler/harbour.c +++ b/harbour/source/compiler/harbour.c @@ -3756,7 +3756,7 @@ int hb_compCompile( char * szPrg, int argc, char * argv[] ) { hb_compOptimizeFrames( pFunc ); - if( szFirstFunction == NULL && pFunc->szName[0] && pFunc->cScope == 0 ) + if( szFirstFunction == NULL && pFunc->szName[0] && ! ( pFunc->cScope & HB_FS_INIT || pFunc->cScope & HB_FS_EXIT ) ) { szFirstFunction = pFunc->szName; } diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index c9c3eb3476..a59ffbc41b 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -264,7 +264,11 @@ int hb_vm_aiExtraElements[HB_MAX_MACRO_ARGS], hb_vm_iExtraElementsIndex = 0, hb_ int hb_vm_iExtraIndex; -extern ULONG hb_macroAutoSetMacro( ULONG ulFlag ); +#ifdef __cplusplus + extern "C" ULONG hb_macroAutoSetMacro( ULONG ulFlag ); +#else + extern ULONG hb_macroAutoSetMacro( ULONG ulFlag ); +#endif /* Request for some action - stop processing of opcodes */