diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7296213637..e65f196ceb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-15 17:51 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/src/vm/hvm.c + ! fixed HB_STACK_TLS_PRELOAD after recent modification + 2011-03-15 14:26 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbthread.h * harbour/src/vm/thread.c diff --git a/harbour/src/vm/hvm.c b/harbour/src/vm/hvm.c index 8c500fbb58..15e0facfe9 100644 --- a/harbour/src/vm/hvm.c +++ b/harbour/src/vm/hvm.c @@ -8745,10 +8745,11 @@ HB_BOOL hb_vmRequestReenterExt( void ) if( !s_fHVMActive ) return HB_FALSE; - -#if defined( HB_MT_VM ) + else { HB_STACK_TLS_PRELOAD + +#if defined( HB_MT_VM ) HB_USHORT uiAction = hb_stackId() == NULL ? HB_VMSTACK_REQUESTED : 0; if( uiAction ) @@ -8757,12 +8758,12 @@ HB_BOOL hb_vmRequestReenterExt( void ) hb_stackPushReturn(); hb_vmPushInteger( uiAction | hb_stackGetActionRequest() ); - } #else - hb_stackPushReturn(); - hb_vmPushInteger( hb_stackGetActionRequest() ); + hb_stackPushReturn(); + hb_vmPushInteger( hb_stackGetActionRequest() ); #endif - hb_stackSetActionRequest( 0 ); + hb_stackSetActionRequest( 0 ); + } return HB_TRUE; }