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

2009-06-20 20:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)

Browse Source 
* source/vm/fm.c
    ! Renamed s_fInited to s_fInitedFM to avoid collision 
      with similarly named variable in estack.c when using
      HB_FM_STATISTICS and HB_HVM_ALL at the same time.
      Thanks Xavi for the find.
This commit is contained in:
Viktor Szakats
2009-06-20 18:31:57 +00:00
parent 6e495cb274
commit fe9ab29884
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
harbour/ChangeLog
View File

@@ -17,6 +17,13 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-06-20 20:31 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/vm/fm.c
! Renamed s_fInited to s_fInitedFM to avoid collision
with similarly named variable in estack.c when using
HB_FM_STATISTICS and HB_HVM_ALL at the same time.
Thanks Xavi for the find.
2009-06-20 20:10 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
* source/rtl/mlcfunc.c
! Fixed after prev optimization. (some optimizations

10
harbour/source/vm/fm.c
View File

@@ -220,7 +220,7 @@
#endif
#ifdef HB_FM_NEED_INIT
static BOOL s_fInited = FALSE;
static BOOL s_fInitedFM = FALSE;
#endif
#ifdef HB_FM_STATISTICS
@@ -471,7 +471,7 @@ void * hb_xalloc( ULONG ulSize ) /* allocates fixed memory, returns NULL
hb_errInternal( HB_EI_XALLOCNULLSIZE, NULL, NULL, NULL );
#ifdef HB_FM_NEED_INIT
if( !s_fInited )
if( !s_fInitedFM )
hb_xinit();
#endif
@@ -550,7 +550,7 @@ void * hb_xgrab( ULONG ulSize ) /* allocates fixed memory, exits on fail
hb_errInternal( HB_EI_XGRABNULLSIZE, NULL, NULL, NULL );
#ifdef HB_FM_NEED_INIT
if( !s_fInited )
if( !s_fInitedFM )
hb_xinit();
#endif
@@ -903,7 +903,7 @@ void hb_xinit( void ) /* Initialize fixed memory subsystem */
HB_TRACE(HB_TR_DEBUG, ("hb_xinit()"));
#ifdef HB_FM_NEED_INIT
if( !s_fInited )
if( !s_fInitedFM )
{
#ifdef HB_FM_STATISTICS
@@ -926,7 +926,7 @@ void hb_xinit( void ) /* Initialize fixed memory subsystem */
s_hProcessHeap = GetProcessHeap();
#endif
s_fInited = TRUE;
s_fInitedFM = TRUE;
}
#endif /* HB_FM_NEED_INIT */
}