From 6cce7ea4c59a59020547f9aeffcf2542ab70470d Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Tue, 25 Aug 2009 17:56:03 +0000
Subject: [PATCH] 2009-08-25 19:55 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/include/hbvmpub.h     ! fixed default
 size macro used in HB_ITEM_PUT_LONGRAW()

  * harbour/include/hbexprb.c
    * enable ("alias")-> optimization only when -ko harbour compiler
      option is used - it changes RT error.
---
 harbour/ChangeLog         | 8 ++++++++
 harbour/include/hbexprb.c | 4 ++--
 harbour/include/hbvmpub.h | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index fb038862ab..5cbf6e0daf 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,14 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-25 19:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbvmpub.h
+    ! fixed default size macro used in HB_ITEM_PUT_LONGRAW()
+
+  * harbour/include/hbexprb.c
+    * enable ("alias")-> optimization only when -ko harbour compiler
+      option is used - it changes RT error.
+
 2009-08-25 18:25 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/global.mk
     + Added SVN revision detection and display in log header.
diff --git a/harbour/include/hbexprb.c b/harbour/include/hbexprb.c
index bf0f182821..f75955d573 100644
--- a/harbour/include/hbexprb.c
+++ b/harbour/include/hbexprb.c
@@ -2184,7 +2184,7 @@ static HB_EXPR_FUNC( hb_compExprUseAliasVar )
          {
             pSelf->value.asAlias.pAlias = hb_compExprReduceList(
                                  pSelf->value.asAlias.pAlias, HB_COMP_PARAM );
-            if( HB_SUPPORT_HARBOUR &&
+            if( HB_SUPPORT_EXTOPT &&
                 pSelf->value.asAlias.pAlias->value.asList.pExprList->ExprType == HB_ET_STRING &&
                 pSelf->value.asAlias.pAlias->value.asList.pExprList->pNext == NULL )
             {
@@ -2323,7 +2323,7 @@ static HB_EXPR_FUNC( hb_compExprUseAliasExpr )
       case HB_EA_REDUCE:
          pSelf->value.asAlias.pAlias   = HB_EXPR_USE( pSelf->value.asAlias.pAlias, HB_EA_REDUCE );
          pSelf->value.asAlias.pExpList = HB_EXPR_USE( pSelf->value.asAlias.pExpList, HB_EA_REDUCE );
-         if( HB_SUPPORT_HARBOUR && pSelf->value.asAlias.pAlias->ExprType == HB_ET_STRING )
+         if( HB_SUPPORT_EXTOPT && pSelf->value.asAlias.pAlias->ExprType == HB_ET_STRING )
             pSelf->value.asAlias.pAlias = hb_compExprReduceAliasString(
                                  pSelf->value.asAlias.pAlias,
                                  pSelf->value.asAlias.pAlias, HB_COMP_PARAM );
diff --git a/harbour/include/hbvmpub.h b/harbour/include/hbvmpub.h
index ffbaaa5911..a3e526fad5 100644
--- a/harbour/include/hbvmpub.h
+++ b/harbour/include/hbvmpub.h
@@ -102,14 +102,14 @@ struct _HB_SYMB;
                do { \
                   (p)->type = HB_IT_INTEGER; \
                   (p)->item.asInteger.value = ( int ) (v); \
-                  (p)->item.asInteger.length = HB_INT_EXPLENGTH( v ); \
+                  (p)->item.asInteger.length = HB_INT_LENGTH( v ); \
                } while( 0 )
 #  else
 #     define HB_ITEM_PUT_LONGRAW( p, v )  \
                do { \
                   (p)->type = HB_IT_LONG; \
                   (p)->item.asLong.value = (v); \
-                  (p)->item.asLong.length = HB_LONG_EXPLENGTH( v ); \
+                  (p)->item.asLong.length = HB_LONG_LENGTH( v ); \
                } while( 0 )
 #  endif