diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index d7a7efd948..bb8409d872 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,13 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-12-21 23:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/rddsql/hbrddsql.h
+  * harbour/contrib/rddsql/sqlbase.c
+    ! reverted recent modification which forces updating also low level
+      SDD code
+    ! fixed casting in C++ mode with local only modification
+
 2009-12-21 13:07 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
   * contrib/hbqt/qtgui/QMenuBar.cpp
   * contrib/hbqt/qth/QMenuBar.qth
diff --git a/harbour/contrib/rddsql/hbrddsql.h b/harbour/contrib/rddsql/hbrddsql.h
index 0493b46e95..f203bb1b79 100644
--- a/harbour/contrib/rddsql/hbrddsql.h
+++ b/harbour/contrib/rddsql/hbrddsql.h
@@ -95,10 +95,10 @@ typedef struct _SQLBASEAREA
    ULONG                      ulRecCount;    /* Total records */
    ULONG                      ulRecMax;      /* Size of pRow, pRowFlags buffer */
 
-   PHB_ITEM *                 pRow;          /* array of native pointers or cached PHB_ITEM */
+   void **                    pRow;          /* array of native pointers or cached PHB_ITEM */
    BYTE *                     pRowFlags;
 
-   PHB_ITEM                   pRecord;
+   void *                     pRecord;
    BYTE                       bRecordFlags;
 
    void *                     pResult;          /* SQL result */
diff --git a/harbour/contrib/rddsql/sqlbase.c b/harbour/contrib/rddsql/sqlbase.c
index 9a52d57dce..9ca28c89b7 100644
--- a/harbour/contrib/rddsql/sqlbase.c
+++ b/harbour/contrib/rddsql/sqlbase.c
@@ -427,7 +427,7 @@ static HB_ERRCODE sqlbaseAppend( SQLBASEAREAP pArea, BOOL bUnLockAll )
 
    if ( pArea->ulRecCount + 1 >= pArea->ulRecMax )
    {
-      pArea->pRow = ( PHB_ITEM * ) hb_xrealloc( pArea->pRow, ( pArea->ulRecMax + SQLDD_ROWSET_RESIZE ) * sizeof( PHB_ITEM ) );
+      pArea->pRow = ( void ** ) hb_xrealloc( pArea->pRow, ( pArea->ulRecMax + SQLDD_ROWSET_RESIZE ) * sizeof( void * ) );
       pArea->pRowFlags = ( BYTE * ) hb_xrealloc( pArea->pRowFlags, ( pArea->ulRecMax + SQLDD_ROWSET_RESIZE ) * sizeof( BYTE ) );
       pArea->ulRecMax += SQLDD_ROWSET_RESIZE;
    }
@@ -464,7 +464,7 @@ static HB_ERRCODE sqlbaseGetValue( SQLBASEAREAP pArea, USHORT uiIndex, PHB_ITEM
 {
    if ( pArea->bRecordFlags & SQLDD_FLAG_CACHED )
    {
-      hb_arrayGet( pArea->pRecord, uiIndex, pItem );
+      hb_arrayGet( ( PHB_ITEM ) pArea->pRecord, uiIndex, pItem );
       return HB_SUCCESS;
    }
    return pArea->pSDD->GetValue( pArea, uiIndex, pItem );
@@ -543,7 +543,7 @@ static HB_ERRCODE sqlbasePutValue( SQLBASEAREAP pArea, USHORT uiIndex, PHB_ITEM
         ( HB_IS_LOGICAL( pItem ) && pField->uiType == HB_FT_LOGICAL ) ||
         HB_IS_NIL( pItem ) )
    {
-       hb_arraySet( pArea->pRecord, uiIndex, pItem );
+       hb_arraySet( ( PHB_ITEM ) pArea->pRecord, uiIndex, pItem );
    }
    else
    {
@@ -746,7 +746,7 @@ static HB_ERRCODE sqlbaseCreate( SQLBASEAREAP pArea, LPDBOPENINFO pOpenInfo )
 
    pArea->ulRecCount = 0;
 
-   pArea->pRow = ( PHB_ITEM * ) hb_xalloc( SQLDD_ROWSET_RESIZE * sizeof( PHB_ITEM ) );
+   pArea->pRow = ( void ** ) hb_xalloc( SQLDD_ROWSET_RESIZE * sizeof( void * ) );
    pArea->pRowFlags = ( BYTE * ) hb_xalloc( SQLDD_ROWSET_RESIZE * sizeof( BYTE ) );
    pArea->ulRecMax = SQLDD_ROWSET_RESIZE;