From 85ea4b601bf5f41add63a3c2447364d886d18537 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 10 Jul 2009 02:46:48 +0000
Subject: [PATCH] 2009-07-10 04:50 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * include/hbdefs.h     - Deleted HB_RESULT. We already have
 HB_ERRCODE.

  * source/main/harbour.c
    * hb_xquery() parameter type updated.
---
 harbour/ChangeLog             | 7 +++++++
 harbour/include/hbdefs.h      | 3 ---
 harbour/source/main/harbour.c | 6 +++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 01b0d36153..c82da1ca49 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-07-10 04:50 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * include/hbdefs.h
+    - Deleted HB_RESULT. We already have HB_ERRCODE.
+
+  * source/main/harbour.c
+    * hb_xquery() parameter type updated.
+
 2009-07-10 04:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * include/hbdefs.h
     + Added HB_RESULT. This is meant to replace current USHORT used
diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h
index ad7d9311f7..f835a569f1 100644
--- a/harbour/include/hbdefs.h
+++ b/harbour/include/hbdefs.h
@@ -726,9 +726,6 @@ typedef unsigned char       hbU8;
                       HB_IT_LONG due to performance reduction. */
 typedef long                hbVMIntMax;       /* TOFIX */
 
-/* To replace error codes. */
-#define HB_RESULT           hbUShort
-
 #define HB_MAX( a, b )          ( ( ( a ) > ( b ) ) ? ( a ) : ( b ) )
 #define HB_MIN( a, b )          ( ( ( a ) < ( b ) ) ? ( a ) : ( b ) )
 
diff --git a/harbour/source/main/harbour.c b/harbour/source/main/harbour.c
index 76bd9d3285..bf5634edc3 100644
--- a/harbour/source/main/harbour.c
+++ b/harbour/source/main/harbour.c
@@ -224,12 +224,12 @@ void hb_xfree( void * pMem )            /* frees fixed memory */
       hb_errInternal( HB_EI_XFREENULL, "hb_xfree called with a NULL pointer", NULL, NULL );
 }
 
-ULONG hb_xquery( USHORT uiMode )
+ULONG hb_xquery( int iMode )
 {
    ULONG ulResult = 0;
 
 #ifdef HB_FM_STATISTICS
-   switch( uiMode )
+   switch( iMode )
    {
       case HB_MEM_USED:
          ulResult = s_ulMemoryConsumed;
@@ -240,7 +240,7 @@ ULONG hb_xquery( USHORT uiMode )
          break;
    }
 #else
-   HB_SYMBOL_UNUSED( uiMode );
+   HB_SYMBOL_UNUSED( iMode );
 #endif
    return ulResult;
 }