From 3292075b00962ba92e6c26c4f28f1ea852fbcb2e Mon Sep 17 00:00:00 2001
From: Ron Pinkas <ron@profit-master.com>
Date: Wed, 23 Jan 2002 23:07:31 +0000
Subject: [PATCH] 2002-01-19 06:11 UTC-0800 Ron Pinkas <ron@ronpinkas.com>    *
 contrib/dot/pp_harb.ch      + #ifdef __XHARBOUR__ to protect xHarbour
 fastitem reliance.

---
 harbour/ChangeLog              |  8 +++++--
 harbour/contrib/dot/pp_harb.ch | 43 +++++++++++++++++++++++++++-------
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c07aab79dd..0c7bad37c5 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -9,6 +9,10 @@
 */
    * tests/testpers.prg
 
+2002-01-24 17:53 UTC+0000 Dave Pearson <davep@davep.org>
+   * include/hbpcode.h
+     * Fixed some spelling errors in the pcode comments.
+
 2002-01-24 10:27 UTC+0000 Dave Pearson <davep@davep.org>
    * source/rtl/profiler.prg
      * HBProfileLowLevel:gatherOPCodes() wasn't making a call to
@@ -184,13 +188,13 @@ ed
 2002-01-21 10:10 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
   * source/vm/hvm.c
   * source/vm/memvars.c
-2002-01-20 08:50 UTC+0800 Ron Pinkas <ron@ronpinkas.com>
+    * Added resetting of HB_IT_MEMOFLAG in functions:
        hb_vmArrayPop(), hb_vmPopLocal(), hb_vmPopStatic(), hb_memvarSetValue()
   * source/rdd/dbfntx/dbfntx1.c
     * Added support of DBOI_POSITION and DBOI_KEYCOUNT to ntxOrderInfo()
       and empty prototypes of hb_ntxTagKeyNo(), hb_ntxTagKeyCount()
 
-2002-01-19 06:11 UTC+0800 Ron Pinkas <ron@ronpinkas.com>
+2002-01-20 13:29 UTC+0100 Patrick Mast <email@patrickmast.com>
    + Added ChangeLog to the /contrib/apollo dir
    + contrib/apollo/test/apollo.ch
      + defines for function sx_SysProp
diff --git a/harbour/contrib/dot/pp_harb.ch b/harbour/contrib/dot/pp_harb.ch
index 0f52e20dc3..c3692d7148 100644
--- a/harbour/contrib/dot/pp_harb.ch
+++ b/harbour/contrib/dot/pp_harb.ch
@@ -96,18 +96,26 @@ RETURN nProcId > 0
 
 #ifdef USE_C_BOOST
 
+#ifdef __XHARBOUR__
+   #pragma BEGINDUMP
+      #define __XHARBOUR__
+   #pragma ENDDUMP
+#endif
+
 #pragma BEGINDUMP
 
 #include <ctype.h>
-
 #include "hbapi.h"
-#include "hbfast.h"
 #include "hbstack.h"
 #include "hbapierr.h"
 #include "hbapiitm.h"
 #include "hbvm.h"
 #include "hboo.ch"
 
+#ifdef __XHARBOUR__
+  #include "hbfast.h"
+#endif
+
 static BOOL s_bArrayPrefix = FALSE;
 
 //----------------------------------------------------------------------------//
@@ -576,8 +584,12 @@ static HB_FUNC( NEXTIDENTIFIER )
 
        //printf( "\nIdentifier: '%s'\n", sIdentifier );
 
-       hb_retcAdopt( sIdentifier );
-       //hb_xfree( sIdentifier );
+       #ifdef __XHARBOUR__
+          hb_retcAdopt( sIdentifier );
+       #else
+          hb_retc( sIdentifier );
+          hb_xfree( sIdentifier );
+       #endif
     }
     else
     {
@@ -622,7 +634,12 @@ HB_FUNC( EXTRACTLEADINGWS )
       hb_itemPutCL( pWS, pTmp, i );
    }
 
-   hb_retclenAdopt( pTmp, i );
+   #ifdef __XHARBOUR__
+      hb_retclenAdopt( pTmp, i );
+   #else
+      hb_retclen( pTmp, i );
+      hb_xfree( pTmp );
+   #endif
 }
 
 //----------------------------------------------------------------------------//
@@ -667,8 +684,12 @@ HB_FUNC( DROPTRAILINGWS )
       hb_itemPutCPtr( pWS, pTmp, iLen - i );
    }
 
-   hb_retclenAdopt( pString, i );
-   //hb_xfree( pString );
+   #ifdef __XHARBOUR__
+      hb_retclenAdopt( pString, i );
+   #else
+      hb_retclen( pString, i );
+      hb_xfree( pString );
+   #endif
 }
 
 //----------------------------------------------------------------------------//
@@ -704,8 +725,12 @@ HB_FUNC( DROPEXTRATRAILINGWS )
       hb_itemPutCL( pLine, pString, i );
    }
 
-   hb_retclenAdopt( pString, i );
-   //hb_xfree( pString );
+   #ifdef __XHARBOUR__
+      hb_retclenAdopt( pString, i );
+   #else
+      hb_retclen( pString, i );
+      hb_xfree( pString );
+   #endif
 }
 
 #pragma ENDDUMP