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

2011-03-15 17:51 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

Browse Source 
* harbour/src/vm/hvm.c
    ! fixed HB_STACK_TLS_PRELOAD after recent modification
This commit is contained in:
Przemyslaw Czerpak
2011-03-15 16:51:48 +00:00
parent 6057dd5088
commit 15160f3bb9
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
harbour/ChangeLog
View File

@@ -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

13
harbour/src/vm/hvm.c
View File

@@ -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;
}