From 4cc3de83be92f3ce898168fb3b88a49b84afa67f Mon Sep 17 00:00:00 2001
From: Przemyslaw Czerpak <druzus@priv.onet.pl>
Date: Tue, 3 Jul 2007 13:30:25 +0000
Subject: [PATCH] 2007-07-03 15:30 UTC+0200 Przemyslaw Czerpak
 (druzus/at/priv.onet.pl)   * harbour/include/hbcompat.ch     * removed bit
 translation rules starting with comma (,)

  * harbour/source/rtl/hbhex.c
  * harbour/source/rdd/delim1.c
  * harbour/source/rdd/dbf1.c
  * harbour/source/rdd/sdf1.c
    ! fixed casting
---
 harbour/ChangeLog           | 10 ++++++++++
 harbour/include/hbcompat.ch |  9 ---------
 harbour/source/rdd/dbf1.c   |  2 +-
 harbour/source/rdd/delim1.c |  2 +-
 harbour/source/rdd/sdf1.c   |  2 +-
 harbour/source/rtl/hbhex.c  |  2 +-
 6 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 8f6ef8d43c..785affd917 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,16 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2007-07-03 15:30 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/include/hbcompat.ch
+    * removed bit translation rules starting with comma (,)
+
+  * harbour/source/rtl/hbhex.c
+  * harbour/source/rdd/delim1.c
+  * harbour/source/rdd/dbf1.c
+  * harbour/source/rdd/sdf1.c
+    ! fixed casting
+
 2007-07-02 18:10 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
   * harbour/source/macro/macro.yyc
   * harbour/source/macro/macro.y
diff --git a/harbour/include/hbcompat.ch b/harbour/include/hbcompat.ch
index e7254ca6a9..f81498efe1 100644
--- a/harbour/include/hbcompat.ch
+++ b/harbour/include/hbcompat.ch
@@ -150,15 +150,6 @@
    #translate ( <exp1> & <exp2>       => ( HB_BITAND( <exp1>, <exp2> )
    #translate ( <exp1> ^^ <exp2>      => ( HB_BITXOR( <exp1>, <exp2> )
 
-   #translate , <exp1> IN <exp2>      => , <exp1> $ <exp2>
-   #translate , <exp1> HAS <exp2>     => , HB_REGEXHAS( <exp2>, <exp1> )
-   #translate , <exp1> LIKE <exp2>    => , HB_REGEXLIKE( <exp2>, <exp1> )
-   #translate , <exp1> \<\< <exp2>    => , HB_BITSHIFT( <exp1>, <exp2> )
-   #translate , <exp1> >> <exp2>      => , HB_BITSHIFT( <exp1>, -<exp2> )
-   #translate , <exp1> | <exp2>       => , HB_BITOR( <exp1>, <exp2> )
-   #translate , <exp1> & <exp2>       => , HB_BITAND( <exp1>, <exp2> )
-   #translate , <exp1> ^^ <exp2>      => , HB_BITXOR( <exp1>, <exp2> )
-
    #xtranslate HB_BITOR( [<expN>,] <exp2> | <exp3> )  => HB_BITOR( [<expN>,] <exp2>, <exp3> )
    #xtranslate HB_BITAND( [<expN>,] <exp2> & <exp3> ) => HB_BITAND( [<expN>,] <exp2>, <exp3> )
    #xtranslate HB_BITXOR( [<expN>,] <exp2> ^^ <exp3> ) => HB_BITXOR( [<expN>,] <exp2>, <exp3> )
diff --git a/harbour/source/rdd/dbf1.c b/harbour/source/rdd/dbf1.c
index 789ca54487..25aeed6b47 100644
--- a/harbour/source/rdd/dbf1.c
+++ b/harbour/source/rdd/dbf1.c
@@ -1470,7 +1470,7 @@ static ERRCODE hb_dbfGetValue( DBFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
          }
          else
          {
-            hb_itemPutDS( pItem, pArea->pRecord + pArea->pFieldOffset[ uiIndex ] );
+            hb_itemPutDS( pItem, ( char * ) pArea->pRecord + pArea->pFieldOffset[ uiIndex ] );
          }
          break;
 
diff --git a/harbour/source/rdd/delim1.c b/harbour/source/rdd/delim1.c
index 47c83a6bf3..ea70896663 100644
--- a/harbour/source/rdd/delim1.c
+++ b/harbour/source/rdd/delim1.c
@@ -589,7 +589,7 @@ static ERRCODE hb_delimGetValue( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM pIte
          break;
 
       case HB_IT_DATE:
-         hb_itemPutDS( pItem, pArea->pRecord + pArea->pFieldOffset[ uiIndex ] );
+         hb_itemPutDS( pItem, ( char * ) pArea->pRecord + pArea->pFieldOffset[ uiIndex ] );
          break;
 
       case HB_IT_LONG:
diff --git a/harbour/source/rdd/sdf1.c b/harbour/source/rdd/sdf1.c
index ade4405add..48812a415c 100644
--- a/harbour/source/rdd/sdf1.c
+++ b/harbour/source/rdd/sdf1.c
@@ -414,7 +414,7 @@ static ERRCODE hb_sdfGetValue( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
          break;
 
       case HB_IT_DATE:
-         hb_itemPutDS( pItem, pArea->pRecord + pArea->pFieldOffset[ uiIndex ] );
+         hb_itemPutDS( pItem, ( char * ) pArea->pRecord + pArea->pFieldOffset[ uiIndex ] );
          break;
 
       case HB_IT_LONG:
diff --git a/harbour/source/rtl/hbhex.c b/harbour/source/rtl/hbhex.c
index 10f6276a6b..488ad1335f 100644
--- a/harbour/source/rtl/hbhex.c
+++ b/harbour/source/rtl/hbhex.c
@@ -122,7 +122,7 @@ HB_FUNC( HB_NUMTOHEX )
       ret[ --iLen ] = iDigit + ( iDigit < 10 ? '0' : 'A' - 10 ); 
       ulNum >>= 4;
    }
-   while( fDefaultLen ? ulNum : iLen );
+   while( fDefaultLen ? ulNum != 0 : iLen != 0 );
 
    hb_retc( &ret[ iLen ] );
 }