diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 5a95178047..cb21fe9b7e 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,18 @@
    2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+
+2006-11-12 09:30 UTC+0100 Marek Paliwoda (mpaliwoda at interia pl)
+   * harbour/makefile.bc
+   * harbour/makefile.vc
+     * Fixed pptable.c dependencies
+
+2006-11-10 17:40 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
+  * harbour/contrib/rdd_ads/rddads.h
+    + added #define WIN32 when HB_OS_WIN_32 is set to not force -DWIN32
+      compiler switch
+
+  * harbour/source/pp/ppcore.c
     * cleaned BCC warnings
 
   * harbour/source/rdd/dbfcdx/dbfcdx1.c
diff --git a/harbour/contrib/rdd_ads/rddads.h b/harbour/contrib/rdd_ads/rddads.h
index 4873f4d732..464587ac8c 100644
--- a/harbour/contrib/rdd_ads/rddads.h
+++ b/harbour/contrib/rdd_ads/rddads.h
@@ -55,6 +55,9 @@
 #endif
 
 #include "hbapirdd.h"
+#if defined( HB_OS_WIN_32 ) && !defined( WIN32 )
+   #define WIN32
+#endif
 #include "ace.h"
 
 HB_EXTERN_BEGIN
diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c
index 928f82586c..f076b78c66 100644
--- a/harbour/source/pp/ppcore.c
+++ b/harbour/source/pp/ppcore.c
@@ -1324,7 +1324,6 @@ static BOOL hb_pp_patternAddResult( PHB_PP_RULE pRule, USHORT marker,
       while( * pResultPtr )
          pResultPtr = &( * pResultPtr )->pNext;
       * pResultPtr = pResult;
-      ++pMarker;
       return TRUE;
    }
 
@@ -1715,7 +1714,7 @@ static BOOL hb_pp_pragmaStream( PHB_PP_STATE pState, PHB_PP_TOKEN pToken )
    BOOL fError = FALSE;
 
    pToken = hb_pp_streamFuncGet( pToken, &pState->pFuncOut );
-   pToken = hb_pp_streamFuncGet( pToken, &pState->pFuncEnd );
+   hb_pp_streamFuncGet( pToken, &pState->pFuncEnd );
 
    return fError;
 }
@@ -4436,8 +4435,7 @@ void hb_pp_setStream( PHB_PP_STATE pState, int iMode )
 /*
  * initialize PP context
  */
-void 
-hb_pp_init( PHB_PP_STATE pState, char * szStdCh, BOOL fQuiet,
+void hb_pp_init( PHB_PP_STATE pState, char * szStdCh, BOOL fQuiet,
                  PHB_PP_OPEN_FUNC  pOpenFunc, PHB_PP_CLOSE_FUNC pCloseFunc,
                  PHB_PP_ERROR_FUNC pErrorFunc, PHB_PP_DISP_FUNC pDispFunc,
                  PHB_PP_DUMP_FUNC pDumpFunc, PHB_PP_INLINE_FUNC pInLineFunc,
@@ -4466,7 +4464,6 @@ hb_pp_init( PHB_PP_STATE pState, char * szStdCh, BOOL fQuiet,
       if( !pFileName->szExtension )
           pFileName->szExtension = ".ch";
       hb_fsFNameMerge( szFileName, pFileName );
-      szStdCh = szFileName;
       hb_xfree( pFileName );
 
       pState->pFile = hb_pp_FileNew( pState, szFileName, FALSE, NULL, pState->pOpenFunc );
diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c
index c439f323ef..a3402dfc9d 100644
--- a/harbour/source/rdd/dbfcdx/dbfcdx1.c
+++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c
@@ -5979,8 +5979,9 @@ static ERRCODE hb_cdxDBOIKeyGoto( CDXAREAP pArea, LPCDXTAG pTag, ULONG ulKeyNo,
    {
       if ( fLogOpt && fFilters && pArea->dbfi.itmCobExpr )
       {
-         SELF_GOTOP( ( AREAP ) pArea );
-         retval = SELF_SKIP( ( AREAP ) pArea, ulKeyCnt );
+         retval = SELF_GOTOP( ( AREAP ) pArea );
+         if( retval == SUCCESS && --ulKeyCnt )
+            retval = SELF_SKIP( ( AREAP ) pArea, ulKeyCnt );
       }
       else
       {