From 6df9526b8de4770a59b4cfda3132e251df4776d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Wed, 4 Mar 2015 11:18:45 +0100
Subject: [PATCH] 2015-03-04 11:18 UTC+0100 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * include/hbapi.h     ! fixed HB_ISMEMO() macro,
 original version was accepting the same       items as HB_ISCHAR() so it was
 not compatible with ISMEMO() macro       in Cl*pper.

  * src/rtl/valtype.c
    * use HB_ISMEMO() macro
---
 ChangeLog.txt     | 9 +++++++++
 include/hbapi.h   | 2 +-
 src/rtl/valtype.c | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index cc625d1224..3eb4554109 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,15 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2015-03-04 11:18 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * include/hbapi.h
+    ! fixed HB_ISMEMO() macro, original version was accepting the same
+      items as HB_ISCHAR() so it was not compatible with ISMEMO() macro
+      in Cl*pper.
+
+  * src/rtl/valtype.c
+    * use HB_ISMEMO() macro
+
 2015-03-04 09:18 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * src/rdd/dbf1.c
   * src/rtl/hbinet.c
diff --git a/include/hbapi.h b/include/hbapi.h
index 9f0759441d..1f8c3b8609 100644
--- a/include/hbapi.h
+++ b/include/hbapi.h
@@ -230,7 +230,7 @@ HB_EXTERN_BEGIN
 #define HB_ISLOG( n )         ( hb_param( n, HB_IT_LOGICAL ) != NULL )
 #define HB_ISDATE( n )        ( hb_param( n, HB_IT_DATE ) != NULL )
 #define HB_ISTIMESTAMP( n )   ( hb_param( n, HB_IT_TIMESTAMP ) != NULL )
-#define HB_ISMEMO( n )        ( hb_param( n, HB_IT_MEMO ) != NULL )
+#define HB_ISMEMO( n )        ( hb_param( n, HB_IT_MEMOFLAG ) != NULL )
 #define HB_ISBYREF( n )       ( ( hb_parinfo( n ) & HB_IT_BYREF ) != 0 )   /* NOTE: Intentionally using a different method */
 #define HB_ISARRAY( n )       ( hb_param( n, HB_IT_ARRAY ) != NULL )
 #define HB_ISOBJECT( n )      ( hb_extIsObject( n ) )
diff --git a/src/rtl/valtype.c b/src/rtl/valtype.c
index 10b330b1f3..b447366634 100644
--- a/src/rtl/valtype.c
+++ b/src/rtl/valtype.c
@@ -116,7 +116,7 @@ HB_FUNC( HB_ISCHAR )
 
 HB_FUNC( HB_ISMEMO )
 {
-   hb_retl( ( hb_parinfo( 1 ) & HB_IT_MEMOFLAG ) != 0 );
+   hb_retl( HB_ISMEMO( 1 ) );
 }
 
 HB_FUNC( HB_ISARRAY )