From fe9ab29884837086d8eaa30e474556f419946cd0 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Sat, 20 Jun 2009 18:31:57 +0000
Subject: [PATCH] 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.

---
 harbour/ChangeLog      |  7 +++++++
 harbour/source/vm/fm.c | 10 +++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5e3609c2ee..5c79153905 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -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
diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c
index c4d3c3d0cc..3dfcbebf5e 100644
--- a/harbour/source/vm/fm.c
+++ b/harbour/source/vm/fm.c
@@ -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 */
 }