From d94370e84e48a1d3d9e3568e968bb0712def048d Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Sat, 20 Sep 2008 01:39:17 +0000
Subject: [PATCH] 2008-09-20 03:38 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/source/vm/hvm.c     * minor
 modification: #ifdef ... => #if defined( ... )

  * harbour/source/rtl/gtcrs/gtcrs.c
  * harbour/source/rtl/gttrm/gttrm.c
    ! fixed reentrance counter resetting
---
 harbour/ChangeLog                | 8 ++++++++
 harbour/source/rtl/gtcrs/gtcrs.c | 2 +-
 harbour/source/rtl/gttrm/gttrm.c | 2 +-
 harbour/source/vm/hvm.c          | 8 ++++----
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a016343b60..550506719f 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2008-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org)
 */
 
+2008-09-20 03:38 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/source/vm/hvm.c
+    * minor modification: #ifdef ... => #if defined( ... )
+
+  * harbour/source/rtl/gtcrs/gtcrs.c
+  * harbour/source/rtl/gttrm/gttrm.c
+    ! fixed reentrance counter resetting
+
 2008-09-20 00:42 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   + harbour/source/rdd/wadetach.c
     + added .prg functions:
diff --git a/harbour/source/rtl/gtcrs/gtcrs.c b/harbour/source/rtl/gtcrs/gtcrs.c
index df6ef217a3..ed3634e3e1 100644
--- a/harbour/source/rtl/gtcrs/gtcrs.c
+++ b/harbour/source/rtl/gtcrs/gtcrs.c
@@ -758,8 +758,8 @@ static int wait_key( InOutBase * ioBase, int milisec )
       return K_RESIZE;
    }
 
-   counter = ++( ioBase->key_counter );
  restart:
+   counter = ++( ioBase->key_counter );
    nKey = esc = n = i = 0;
  again:
    if ( ( nKey = getMouseKey( &ioBase->mLastEvt ) ) != 0 )
diff --git a/harbour/source/rtl/gttrm/gttrm.c b/harbour/source/rtl/gttrm/gttrm.c
index ed6222884e..c7c82a75ae 100644
--- a/harbour/source/rtl/gttrm/gttrm.c
+++ b/harbour/source/rtl/gttrm/gttrm.c
@@ -1332,8 +1332,8 @@ static int wait_key( PHB_GTTRM pTerm, int milisec )
    }
 #endif
 
-   counter = ++( pTerm->key_counter );
 restart:
+   counter = ++( pTerm->key_counter );
    nKey = esc = n = i = 0;
 again:
    if( ( nKey = getMouseKey( &pTerm->mLastEvt ) ) != 0 )
diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c
index 9a4c1ac765..42b60dca43 100644
--- a/harbour/source/vm/hvm.c
+++ b/harbour/source/vm/hvm.c
@@ -975,7 +975,7 @@ HB_EXPORT void hb_vmExecute( const BYTE * pCode, PHB_SYMB pSymbols )
    ULONG ulLastOpcode = 0; /* opcodes profiler support */
    ULONG ulPastClock = 0;  /* opcodes profiler support */
 #endif
-#ifndef HB_GUI
+#if !defined( HB_GUI )
    static unsigned short uiPolls = 1;
 #endif
 
@@ -1000,7 +1000,7 @@ HB_EXPORT void hb_vmExecute( const BYTE * pCode, PHB_SYMB pSymbols )
       }
 #endif
 
-#ifndef HB_GUI
+#if !defined( HB_GUI )
       if( ! --uiPolls )
       {
          hb_inkeyPoll();
@@ -5179,7 +5179,7 @@ HB_EXPORT void hb_vmDo( USHORT uiParams )
 #endif
 
    /* Poll the console keyboard
-   #ifndef HB_GUI
+   #if !defined( HB_GUI )
       hb_inkeyPoll();
    #endif
    */
@@ -5281,7 +5281,7 @@ HB_EXPORT void hb_vmSend( USHORT uiParams )
 #endif
 
    /* Poll the console keyboard
-   #ifndef HB_GUI
+   #if !defined( HB_GUI )
       hb_inkeyPoll();
    #endif
    */