2010-01-15 00:45 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* contrib/hbbmcdx/bmdbfcdx.c
  * contrib/hbbmcdx/hbbmcdx.h
  * include/hbapirdd.h
  * include/hbdbsort.h
  * include/hbrddcdx.h
  * include/hbrdddbf.h
  * include/hbrdddel.h
  * include/hbrddfpt.h
  * include/hbrddnsx.h
  * include/hbrddntx.h
  * include/hbrddsdf.h
  * src/rdd/dbcmd.c
  * src/rdd/dbcmd53.c
  * src/rdd/dbdetach.c
  * src/rdd/dbf1.c
  * src/rdd/dbfcdx/dbfcdx1.c
  * src/rdd/dbffpt/dbffpt1.c
  * src/rdd/dbfnsx/dbfnsx1.c
  * src/rdd/dbfntx/dbfntx1.c
  * src/rdd/dbsql.c
  * src/rdd/delim1.c
  * src/rdd/hbdbsort.c
  * src/rdd/hbsix/sxcompr.c
  * src/rdd/hbsix/sxcrypt.c
  * src/rdd/hbsix/sxfname.c
  * src/rdd/hbsix/sxord.c
  * src/rdd/hbsix/sxsem.c
  * src/rdd/hbsix/sxtable.c
  * src/rdd/hbsix/sxutil.c
  * src/rdd/hsx/hsx.c
  * src/rdd/nulsys/nulsys.c
  * src/rdd/sdf1.c
  * src/rdd/usrrdd/usrrdd.c
  * src/rdd/wacore.c
  * src/rdd/wafunc.c
  * src/rdd/workarea.c
    * BOOL  -> HB_BOOL
    * TRUE  -> HB_TRUE
    * FALSE -> HB_FALSE

harbour/ChangeLog

@@ -17,6 +17,47 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2010-01-15 00:45 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+  * contrib/hbbmcdx/bmdbfcdx.c
+  * contrib/hbbmcdx/hbbmcdx.h
+  * include/hbapirdd.h
+  * include/hbdbsort.h
+  * include/hbrddcdx.h
+  * include/hbrdddbf.h
+  * include/hbrdddel.h
+  * include/hbrddfpt.h
+  * include/hbrddnsx.h
+  * include/hbrddntx.h
+  * include/hbrddsdf.h
+  * src/rdd/dbcmd.c
+  * src/rdd/dbcmd53.c
+  * src/rdd/dbdetach.c
+  * src/rdd/dbf1.c
+  * src/rdd/dbfcdx/dbfcdx1.c
+  * src/rdd/dbffpt/dbffpt1.c
+  * src/rdd/dbfnsx/dbfnsx1.c
+  * src/rdd/dbfntx/dbfntx1.c
+  * src/rdd/dbsql.c
+  * src/rdd/delim1.c
+  * src/rdd/hbdbsort.c
+  * src/rdd/hbsix/sxcompr.c
+  * src/rdd/hbsix/sxcrypt.c
+  * src/rdd/hbsix/sxfname.c
+  * src/rdd/hbsix/sxord.c
+  * src/rdd/hbsix/sxsem.c
+  * src/rdd/hbsix/sxtable.c
+  * src/rdd/hbsix/sxutil.c
+  * src/rdd/hsx/hsx.c
+  * src/rdd/nulsys/nulsys.c
+  * src/rdd/sdf1.c
+  * src/rdd/usrrdd/usrrdd.c
+  * src/rdd/wacore.c
+  * src/rdd/wafunc.c
+  * src/rdd/workarea.c
+    * BOOL  -> HB_BOOL
+    * TRUE  -> HB_TRUE
+    * FALSE -> HB_FALSE
+
 2010-01-14 23:46 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
   * contrib/rddsql/sddmy/mysqldd.c
   * contrib/rddsql/sddpg/pgsqldd.c

harbour/contrib/hbbmcdx/hbbmcdx.h

@@ -270,7 +270,7 @@ typedef struct _CDXPAGE
    int      iKeys;
    int      iCurKey;
 
-   BOOL     fChanged;
+   HB_BOOL  fChanged;
    BYTE     bUsed;
 
    ULONG    RNMask;
@@ -280,7 +280,7 @@ typedef struct _CDXPAGE
    BYTE     TCBits;
    BYTE     DCMask;
    BYTE     TCMask;
-   BOOL     fBufChanged;
+   HB_BOOL  fBufChanged;
    union
    {
       CDXEXTNODE extNode;
@@ -312,7 +312,7 @@ typedef CDXSTACK * LPCDXSTACK;
 typedef struct _CDXLIST
 {
    ULONG    ulAddr;
-   BOOL     fStat;
+   HB_BOOL  fStat;
    struct _CDXLIST * pNext;
 } CDXLIST;
 typedef CDXLIST * LPCDXLIST;
@@ -329,23 +329,23 @@ typedef struct _CDXTAG
    USHORT   nField;           /* Field number for simple (one field) key expersion */
    BYTE     bTrail;           /* trailing character for shorter key value */
    BYTE     OptFlags;         /* index options flag */
-   BOOL     AscendKey;        /* ascending/descending order flag */
-   BOOL     UniqueKey;        /* unique order flag */
-   BOOL     Temporary;        /* temporary order flag */
-   BOOL     Custom;           /* custom order flag */
-   BOOL     Template;         /* user keyadata in ordKeyAdd()/ordKeyDel() accepted */
-   BOOL     MultiKey;         /* repeated key values in custom indexes accepted */
-   BOOL     Partial;          /* order is updated only partially - missing keys possible */
-   BOOL     ChgOnly;          /* only existing key modifications are updated, no new key added */
-   BOOL     UsrAscend;        /* user settable ascending/descending order flag */
-   BOOL     UsrUnique;        /* user settable unique order flag */
-   BOOL     IgnoreCase;       /* ignore case (upper keys) */
+   HB_BOOL  AscendKey;        /* ascending/descending order flag */
+   HB_BOOL  UniqueKey;        /* unique order flag */
+   HB_BOOL  Temporary;        /* temporary order flag */
+   HB_BOOL  Custom;           /* custom order flag */
+   HB_BOOL  Template;         /* user keyadata in ordKeyAdd()/ordKeyDel() accepted */
+   HB_BOOL  MultiKey;         /* repeated key values in custom indexes accepted */
+   HB_BOOL  Partial;          /* order is updated only partially - missing keys possible */
+   HB_BOOL  ChgOnly;          /* only existing key modifications are updated, no new key added */
+   HB_BOOL  UsrAscend;        /* user settable ascending/descending order flag */
+   HB_BOOL  UsrUnique;        /* user settable unique order flag */
+   HB_BOOL  IgnoreCase;       /* ignore case (upper keys) */
 
-   BOOL     TagChanged;
-   BOOL     TagBOF;
-   BOOL     TagEOF;
+   HB_BOOL  TagChanged;
+   HB_BOOL  TagBOF;
+   HB_BOOL  TagEOF;
 
-   BOOL     fRePos;
+   HB_BOOL  fRePos;
    int      curKeyState;      /* see: CDX_CURKEY_* */
    ULONG    rawKeyCount;
    ULONG    rawKeyPos;
@@ -365,7 +365,7 @@ typedef struct _CDXTAG
    LPCDXPAGE RootPage;        /* pointer to root of keys tree in memory */
    LPCDXKEY  CurKey;          /* current value of key expression */
    LPCDXKEY  HotKey;          /* value of hot key expression */
-   BOOL      HotFor;          /* index FOR condition for HotKey */
+   HB_BOOL   HotFor;          /* index FOR condition for HotKey */
 
    PHB_ITEM  topScope;        /* Top scope HB_ITEM */
    LPCDXKEY  topScopeKey;     /* Top scope index key */
@@ -385,9 +385,9 @@ typedef struct _CDXINDEX
    struct _CDXINDEX * pNext;  /* The next index in the list */
    LPCDXTAG    pCompound;     /* Compound tag */
    LPCDXTAG    TagList;       /* List of tags in index file */
-   BOOL        fShared;       /* Shared file */
-   BOOL        fReadonly;     /* Read only file */
-   BOOL        fDelete;       /* delete on close flag */
+   HB_BOOL     fShared;       /* Shared file */
+   HB_BOOL     fReadonly;     /* Read only file */
+   HB_BOOL     fDelete;       /* delete on close flag */
    ULONG       nextAvail;     /* offset to next free page in the end of index file */
    ULONG       freePage;      /* offset to next free page inside index file */
    LPCDXLIST   freeLst;       /* list of free pages in index file */
@@ -395,12 +395,12 @@ typedef struct _CDXINDEX
    int         lockRead;      /* number of read lock set */
    HB_FOFFSET  ulLockPos;     /* readlock position for CL53 lock scheme */
 #ifdef HB_CDX_DBGCODE
-   BOOL        RdLck;
-   BOOL        WrLck;
+   HB_BOOL     RdLck;
+   HB_BOOL     WrLck;
 #endif
-   BOOL        fChanged;      /* changes written to index, need upadte ulVersion */
+   HB_BOOL     fChanged;      /* changes written to index, need upadte ulVersion */
    ULONG       ulVersion;     /* network version/update flag */
-   BOOL        fFlush;        /* changes written to index, need upadte ulVersion */
+   HB_BOOL     fFlush;        /* changes written to index, need upadte ulVersion */
 } CDXINDEX;
 typedef CDXINDEX * LPCDXINDEX;
 
@@ -422,8 +422,8 @@ typedef struct
    char *   szTempFileName;   /* temporary file name */
    int      keyLen;           /* key length */
    BYTE     bTrl;             /* filler char for shorter keys */
-   BOOL     fUnique;          /* TRUE if index is unique */
-   BOOL     fReindex;         /* TRUE if reindexing is in process */
+   HB_BOOL  fUnique;          /* HB_TRUE if index is unique */
+   HB_BOOL  fReindex;         /* HB_TRUE if reindexing is in process */
    ULONG    ulMaxRec;         /* the highest record number */
    ULONG    ulTotKeys;        /* total number of keys indexed */
    ULONG    ulKeys;           /* keys in curently created page */
@@ -466,7 +466,7 @@ typedef struct _CDXAREA
    *  example.
    */
 
-   BOOL           fCdxAppend;    /* Appended record changed */
+   HB_BOOL        fCdxAppend;    /* Appended record changed */
    LPCDXINDEX     lpIndexes;     /* Pointer to indexes array  */
    USHORT         uiTag;         /* current tag focus */
    LPCDXSORTINFO  pSort;         /* Index build structure */
@@ -485,13 +485,14 @@ typedef CDXAREA * LPCDXAREA;
 #define BM_ClrBit(m,b,r) do { if((r)<=(b)) (m)[((r)-1)>>5] = (m)[((r)-1)>>5] & ~(1<<(((r)-1)%32)); } while(0)
 #define BM_GetBit(m,b,r) ( ((r)<=(b)) ? (m)[((r)-1)>>5] & (1<<(((r)-1)%32)) : 0 )
 
-typedef struct _BM_FILTER_ {
-    PHB_ITEM itmCobExpr;       /* Block representation of the FILTER expression */
-    PHB_ITEM abFilterText;     /* String representation of FILTER expression */
-    BOOL     fFilter;          /* flag to indicate that filter is active */
-    BOOL     fOptimized;       /* Is (should be) filter optimized */
-    ULONG*   rmap;
-    ULONG    Size;
+typedef struct _BM_FILTER_
+{
+   PHB_ITEM itmCobExpr;       /* Block representation of the FILTER expression */
+   PHB_ITEM abFilterText;     /* String representation of FILTER expression */
+   HB_BOOL  fFilter;          /* flag to indicate that filter is active */
+   HB_BOOL  fOptimized;       /* Is (should be) filter optimized */
+   ULONG *  rmap;
+   ULONG    Size;
 } BM_FILTER;
 
 typedef BM_FILTER * LPBM_FILTER;
@@ -511,12 +512,12 @@ static HB_ERRCODE hb_cdxGoBottom( CDXAREAP pArea );
 #define hb_cdxGoTo                                 NULL
 #define hb_cdxGoToId                               NULL
 static HB_ERRCODE hb_cdxGoTop( CDXAREAP pArea );
-static HB_ERRCODE hb_cdxSeek( CDXAREAP pArea, BOOL bSoftSeek, PHB_ITEM pKey, BOOL bFindLast );
+static HB_ERRCODE hb_cdxSeek( CDXAREAP pArea, HB_BOOL bSoftSeek, PHB_ITEM pKey, HB_BOOL bFindLast );
 static HB_ERRCODE hb_cdxSkip( CDXAREAP pArea, LONG lToSkip );
 static HB_ERRCODE hb_cdxSkipFilter( CDXAREAP pArea, LONG lUpDown );
 static HB_ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, LONG lToSkip );
 #define hb_cdxAddField                             NULL
-static HB_ERRCODE hb_cdxAppend( CDXAREAP pArea, BOOL bUnLockAll );
+static HB_ERRCODE hb_cdxAppend( CDXAREAP pArea, HB_BOOL bUnLockAll );
 #define hb_cdxCreateFields                         NULL
 static HB_ERRCODE hb_cdxDeleteRec( CDXAREAP pArea );
 #define hb_cdxDeleted                              NULL

harbour/include/hbapirdd.h

@@ -192,8 +192,8 @@ typedef struct
    USHORT         unused;
    const char *   abName;           /* The qualified name of the data store */
    const char *   atomAlias;        /* The logical name of the data store */
-   BOOL           fShared;          /* Share mode of the data store */
-   BOOL           fReadonly;        /* Readonly mode of the data store */
+   HB_BOOL        fShared;          /* Share mode of the data store */
+   HB_BOOL        fReadonly;        /* Readonly mode of the data store */
    const char *   cdpId;            /* Id of a codepage */
    ULONG          ulConnection;     /* connection handler for RDDs which support it */
    void *         lpdbHeader;       /* Pointer to a header of the data store */
@@ -211,7 +211,7 @@ typedef DBOPENINFO * LPDBOPENINFO;
 
 typedef struct _DBORDERCONDINFO
 {
-   BOOL           fActive;
+   HB_BOOL        fActive;
    char *         abFor;
    char *         abWhile;
    PHB_ITEM       itmCobFor;
@@ -221,18 +221,18 @@ typedef struct _DBORDERCONDINFO
    PHB_ITEM       itmStartRecID;
    LONG           lNextCount;
    PHB_ITEM       itmRecID;
-   BOOL           fRest;
-   BOOL           fDescending;
-   BOOL           fScoped;
-   BOOL           fAll;
-   BOOL           fAdditive;
-   BOOL           fUseCurrent;
-   BOOL           fCustom;
-   BOOL           fNoOptimize;
-   BOOL           fCompound;
-   BOOL           fUseFilter;
-   BOOL           fTemporary;
-   BOOL           fExclusive;
+   HB_BOOL        fRest;
+   HB_BOOL        fDescending;
+   HB_BOOL        fScoped;
+   HB_BOOL        fAll;
+   HB_BOOL        fAdditive;
+   HB_BOOL        fUseCurrent;
+   HB_BOOL        fCustom;
+   HB_BOOL        fNoOptimize;
+   HB_BOOL        fCompound;
+   HB_BOOL        fUseFilter;
+   HB_BOOL        fTemporary;
+   HB_BOOL        fExclusive;
    void *         lpvCargo;
 } DBORDERCONDINFO;
 
@@ -245,7 +245,7 @@ typedef struct
    const char *   abConstrName;     /* Name of relational integrity constraint */
    const char *   abTargetName;     /* Name of target relation table */
    PHB_ITEM       itmRelationKey;   /* Array of columns in source table to match target primary key */
-   BOOL           fEnabled;         /* Is constraint enabled ? */
+   HB_BOOL        fEnabled;         /* Is constraint enabled ? */
 } DBCONSTRAINTINFO;
 
 typedef DBCONSTRAINTINFO * LPDBCONSTRAINTINFO;
@@ -263,7 +263,7 @@ typedef struct
    const char *       abBagName;          /* Name of the Order bag */
    const char*        atomBagName;        /* Name of the Order */
    PHB_ITEM           itmOrder;
-   BOOL               fUnique;            /* Flag to determine if all keys are unique */
+   HB_BOOL            fUnique;            /* Flag to determine if all keys are unique */
    PHB_ITEM           itmCobExpr;         /* Code block containing the KEY expression */
    PHB_ITEM           abExpr;             /* String containing the KEY expression */
    LPDBCONSTRAINTINFO lpdbConstraintInfo; /* Relational constraint info */
@@ -286,7 +286,7 @@ typedef struct
    PHB_ITEM itmCobExpr;   /* Code block containing the KEY expression */
    PHB_ITEM itmResult;    /* Operation result */
    PHB_ITEM itmNewVal;    /* New Setting   */
-   BOOL     fAllTags;     /* Open all tags */
+   HB_BOOL  fAllTags;     /* Open all tags */
 } DBORDERINFO;
 
 typedef DBORDERINFO * LPDBORDERINFO;
@@ -308,12 +308,12 @@ typedef struct
    PHB_ITEM lNext;       /* NEXT record */
    PHB_ITEM itmRecID;    /* single record ID */
    PHB_ITEM fRest;       /* TRUE if start from the current record */
-   BOOL     fIgnoreFilter;       /* process should ignore any filter condition */
-   BOOL     fIncludeDeleted;     /* process should include deleted records */
-   BOOL     fLast;               /* last record of the current scope required */
-   BOOL     fIgnoreDuplicates;   /* process should ignore duplicate key value */
-   BOOL     fBackward;           /* skip backward */
-   BOOL     fOptimized;          /* Is (should be) scope optimized */
+   HB_BOOL  fIgnoreFilter;       /* process should ignore any filter condition */
+   HB_BOOL  fIncludeDeleted;     /* process should include deleted records */
+   HB_BOOL  fLast;               /* last record of the current scope required */
+   HB_BOOL  fIgnoreDuplicates;   /* process should ignore duplicate key value */
+   HB_BOOL  fBackward;           /* skip backward */
+   HB_BOOL  fOptimized;          /* Is (should be) scope optimized */
 } DBSCOPEINFO;
 
 typedef DBSCOPEINFO * LPDBSCOPEINFO;
@@ -345,8 +345,8 @@ typedef struct
 {
    PHB_ITEM itmCobExpr;       /* Block representation of the FILTER expression */
    PHB_ITEM abFilterText;     /* String representation of FILTER expression */
-   BOOL     fFilter;          /* flag to indicate that filter is active */
-   BOOL     fOptimized;       /* Is (should be) filter optimized */
+   HB_BOOL  fFilter;          /* flag to indicate that filter is active */
+   HB_BOOL  fOptimized;       /* Is (should be) filter optimized */
    void *   lpvCargo;         /* RDD specific extended filter info */
 } DBFILTERINFO;
 
@@ -364,8 +364,8 @@ typedef struct _DBRELINFO
 {
    PHB_ITEM            itmCobExpr;   /* Block representation of the relational SEEK key */
    PHB_ITEM            abKey;        /* String representation of the relational SEEK key */
-   BOOL                isScoped;     /* Is this relation scoped */
-   BOOL                isOptimized;  /* Is relation optimized */
+   HB_BOOL             isScoped;     /* Is this relation scoped */
+   HB_BOOL             isOptimized;  /* Is relation optimized */
    struct _AREA      * lpaParent;    /* The parent of this relation */
    struct _AREA      * lpaChild;     /* The parents children */
    struct _DBRELINFO * lpdbriNext;   /* Next child or parent */
@@ -563,11 +563,11 @@ typedef struct _AREA
    LPFIELD lpFields;             /* Pointer to an array of fields */
    void * lpFieldExtents;        /* Void ptr for additional field properties */
    PHB_ITEM valResult;           /* All purpose result holder */
-   BOOL fTop;                    /* TRUE if "top" */
-   BOOL fBottom;                 /* TRUE if "bottom" */
-   BOOL fBof;                    /* TRUE if "bof" */
-   BOOL fEof;                    /* TRUE if "eof" */
-   BOOL fFound;                  /* TRUE if "found" */
+   HB_BOOL fTop;                 /* HB_TRUE if "top" */
+   HB_BOOL fBottom;              /* HB_TRUE if "bottom" */
+   HB_BOOL fBof;                 /* HB_TRUE if "bof" */
+   HB_BOOL fEof;                 /* HB_TRUE if "eof" */
+   HB_BOOL fFound;               /* HB_TRUE if "found" */
    DBSCOPEINFO dbsi;             /* Info regarding last LOCATE */
    DBFILTERINFO dbfi;            /* Filter in effect */
    LPDBORDERCONDINFO lpdbOrdCondInfo;
@@ -589,8 +589,8 @@ typedef AREA * LPAREA;
 /*--------------------* Virtual Method Table *----------------------*/
 
 typedef HB_ERRCODE ( * DBENTRYP_V     )( AREAP area );
-typedef HB_ERRCODE ( * DBENTRYP_BP    )( AREAP area, BOOL * param );
-typedef HB_ERRCODE ( * DBENTRYP_B     )( AREAP area, BOOL param );
+typedef HB_ERRCODE ( * DBENTRYP_BP    )( AREAP area, HB_BOOL * param );
+typedef HB_ERRCODE ( * DBENTRYP_B     )( AREAP area, HB_BOOL param );
 typedef HB_ERRCODE ( * DBENTRYP_L     )( AREAP area, LONG param );
 typedef HB_ERRCODE ( * DBENTRYP_UL    )( AREAP area, ULONG param );
 typedef HB_ERRCODE ( * DBENTRYP_I     )( AREAP area, PHB_ITEM param );
@@ -625,10 +625,10 @@ typedef HB_ERRCODE ( * DBENTRYP_VSP   )( AREAP area, USHORT action, ULONG lRecor
 typedef HB_ERRCODE ( * DBENTRYP_SVL   )( AREAP area, USHORT index, ULONG * param );
 typedef HB_ERRCODE ( * DBENTRYP_SSI   )( AREAP area, USHORT p1, USHORT p2, PHB_ITEM p3 );
 typedef HB_ERRCODE ( * DBENTRYP_ISI   )( AREAP area, PHB_ITEM p1, USHORT p2, PHB_ITEM p3 );
-typedef HB_ERRCODE ( * DBENTRYP_BIB   )( AREAP area, BOOL p1, PHB_ITEM p2, BOOL p3 );
+typedef HB_ERRCODE ( * DBENTRYP_BIB   )( AREAP area, HB_BOOL p1, PHB_ITEM p2, HB_BOOL p3 );
 typedef HB_ERRCODE ( * DBENTRYP_VPL   )( AREAP area, void * p1, LONG p2 );
 typedef HB_ERRCODE ( * DBENTRYP_VPLP  )( AREAP area, void * p1, LONG * p2 );
-typedef HB_ERRCODE ( * DBENTRYP_LSP   )( AREAP area, ULONG p1, BOOL * p2 );
+typedef HB_ERRCODE ( * DBENTRYP_LSP   )( AREAP area, ULONG p1, HB_BOOL * p2 );
 
 /* this methods DO USE take a Workarea but an RDDNODE */
 
@@ -1188,19 +1188,19 @@ extern HB_EXPORT PHB_ITEM     hb_rddList( USHORT uiType );
 extern HB_EXPORT void         hb_rddCloseAll( void );
 extern HB_EXPORT void         hb_rddFlushAll( void );
 extern HB_EXPORT void         hb_rddUnLockAll( void );
-extern HB_EXPORT BOOL         hb_rddGetNetErr( void );
-extern HB_EXPORT void         hb_rddSetNetErr( BOOL fNetErr );
+extern HB_EXPORT HB_BOOL      hb_rddGetNetErr( void );
+extern HB_EXPORT void         hb_rddSetNetErr( HB_BOOL fNetErr );
 
 extern HB_EXPORT HB_ERRCODE   hb_rddOpenTable(
                                  const char * szFileName, const char * szDriver,
                                  USHORT uiArea, const char *szAlias,
-                                 BOOL fShared, BOOL fReadonly,
+                                 HB_BOOL fShared, HB_BOOL fReadonly,
                                  const char * szCpId, ULONG ulConnection,
                                  PHB_ITEM pStruct, PHB_ITEM pDelim );
 extern HB_EXPORT HB_ERRCODE   hb_rddCreateTable(
                                  const char * szFileName, const char * szDriver,
                                  USHORT uiArea, const char *szAlias,
-                                 BOOL fKeepOpen,
+                                 HB_BOOL fKeepOpen,
                                  const char * szCpId, ULONG ulConnection,
                                  PHB_ITEM pStruct, PHB_ITEM pDelim );
 extern HB_EXPORT HB_ERRCODE   hb_rddCreateTableTemp(
@@ -1216,7 +1216,7 @@ extern HB_EXPORT HB_ERRCODE   hb_rddTransRecords(
                                  AREAP pArea,
                                  const char *szFileName, const char *szDriver,
                                  ULONG ulConnection,
-                                 PHB_ITEM pFields, BOOL fExport,
+                                 PHB_ITEM pFields, HB_BOOL fExport,
                                  PHB_ITEM pCobFor, PHB_ITEM pStrFor,
                                  PHB_ITEM pCobWhile, PHB_ITEM pStrWhile,
                                  PHB_ITEM pNext, PHB_ITEM pRecID,
@@ -1230,7 +1230,7 @@ extern HB_EXPORT HB_ERRCODE   hb_rddEvalWA( PHB_ITEM pBlock );
 
 extern HB_EXPORT HB_ERRCODE   hb_rddDetachArea( AREAP pArea, PHB_ITEM pCargo );
 extern HB_EXPORT AREAP        hb_rddRequestArea( const char * szAlias, PHB_ITEM pCargo,
-                                                 BOOL fNewArea, BOOL fWait );
+                                                 HB_BOOL fNewArea, HB_BOOL fWait );
 
 typedef HB_ERRCODE ( * WACALLBACK )( AREAP, void * );
 extern HB_EXPORT HB_ERRCODE   hb_rddIterateWorkAreas( WACALLBACK pCallBack, void * cargo );

harbour/include/hbdbsort.h

@@ -83,10 +83,10 @@ typedef DBQUICKSORT * LPDBQUICKSORT;
  *  PROTOTYPES
  *  ----------
  */
-extern BOOL hb_dbQSortInit( LPDBQUICKSORT pQuickSort, LPDBSORTINFO pSortInfo, USHORT uiRecordLen );
-extern void hb_dbQSortExit( LPDBQUICKSORT pQuickSort );
-extern BOOL hb_dbQSortAdvance( LPDBQUICKSORT pQuickSort, USHORT uiCount );
-extern void hb_dbQSortComplete( LPDBQUICKSORT pQuickSort );
+extern HB_BOOL hb_dbQSortInit( LPDBQUICKSORT pQuickSort, LPDBSORTINFO pSortInfo, USHORT uiRecordLen );
+extern void    hb_dbQSortExit( LPDBQUICKSORT pQuickSort );
+extern HB_BOOL hb_dbQSortAdvance( LPDBQUICKSORT pQuickSort, USHORT uiCount );
+extern void    hb_dbQSortComplete( LPDBQUICKSORT pQuickSort );
 
 HB_EXTERN_END
 

harbour/include/hbrddcdx.h

@@ -265,7 +265,7 @@ typedef struct _CDXPAGE
    int      iKeys;
    int      iCurKey;
 
-   BOOL     fChanged;
+   HB_BOOL  fChanged;
    BYTE     bUsed;
 
    ULONG    RNMask;
@@ -275,7 +275,7 @@ typedef struct _CDXPAGE
    BYTE     TCBits;
    BYTE     DCMask;
    BYTE     TCMask;
-   BOOL     fBufChanged;
+   HB_BOOL  fBufChanged;
    union
    {
       CDXEXTNODE extNode;
@@ -307,7 +307,7 @@ typedef CDXSTACK * LPCDXSTACK;
 typedef struct _CDXLIST
 {
    ULONG    ulAddr;
-   BOOL     fStat;
+   HB_BOOL  fStat;
    struct _CDXLIST * pNext;
 } CDXLIST;
 typedef CDXLIST * LPCDXLIST;
@@ -324,23 +324,23 @@ typedef struct _CDXTAG
    USHORT   nField;           /* Field number for simple (one field) key expersion */
    BYTE     bTrail;           /* trailing character for shorter key value */
    BYTE     OptFlags;         /* index options flag */
-   BOOL     AscendKey;        /* ascending/descending order flag */
-   BOOL     UniqueKey;        /* unique order flag */
-   BOOL     Temporary;        /* temporary order flag */
-   BOOL     Custom;           /* custom order flag */
-   BOOL     Template;         /* user keyadata in ordKeyAdd()/ordKeyDel() accepted */
-   BOOL     MultiKey;         /* repeated key values in custom indexes accepted */
-   BOOL     Partial;          /* order is updated only partially - missing keys possible */
-   BOOL     ChgOnly;          /* only existing key modifications are updated, no new key added */
-   BOOL     UsrAscend;        /* user settable ascending/descending order flag */
-   BOOL     UsrUnique;        /* user settable unique order flag */
-   BOOL     IgnoreCase;       /* ignore case (upper keys) */
+   HB_BOOL  AscendKey;        /* ascending/descending order flag */
+   HB_BOOL  UniqueKey;        /* unique order flag */
+   HB_BOOL  Temporary;        /* temporary order flag */
+   HB_BOOL  Custom;           /* custom order flag */
+   HB_BOOL  Template;         /* user keyadata in ordKeyAdd()/ordKeyDel() accepted */
+   HB_BOOL  MultiKey;         /* repeated key values in custom indexes accepted */
+   HB_BOOL  Partial;          /* order is updated only partially - missing keys possible */
+   HB_BOOL  ChgOnly;          /* only existing key modifications are updated, no new key added */
+   HB_BOOL  UsrAscend;        /* user settable ascending/descending order flag */
+   HB_BOOL  UsrUnique;        /* user settable unique order flag */
+   HB_BOOL  IgnoreCase;       /* ignore case (upper keys) */
 
-   BOOL     TagChanged;
-   BOOL     TagBOF;
-   BOOL     TagEOF;
+   HB_BOOL  TagChanged;
+   HB_BOOL  TagBOF;
+   HB_BOOL  TagEOF;
 
-   BOOL     fRePos;
+   HB_BOOL  fRePos;
    int      curKeyState;      /* see: CDX_CURKEY_* */
    ULONG    rawKeyCount;
    ULONG    rawKeyPos;
@@ -360,7 +360,7 @@ typedef struct _CDXTAG
    LPCDXPAGE RootPage;        /* pointer to root of keys tree in memory */
    LPCDXKEY  CurKey;          /* current value of key expression */
    LPCDXKEY  HotKey;          /* value of hot key expression */
-   BOOL      HotFor;          /* index FOR condition for HotKey */
+   HB_BOOL   HotFor;          /* index FOR condition for HotKey */
 
    PHB_ITEM  topScope;        /* Top scope HB_ITEM */
    LPCDXKEY  topScopeKey;     /* Top scope index key */
@@ -380,9 +380,9 @@ typedef struct _CDXINDEX
    struct _CDXINDEX * pNext;  /* The next index in the list */
    LPCDXTAG    pCompound;     /* Compound tag */
    LPCDXTAG    TagList;       /* List of tags in index file */
-   BOOL        fShared;       /* Shared file */
-   BOOL        fReadonly;     /* Read only file */
-   BOOL        fDelete;       /* delete on close flag */
+   HB_BOOL     fShared;       /* Shared file */
+   HB_BOOL     fReadonly;     /* Read only file */
+   HB_BOOL     fDelete;       /* delete on close flag */
    ULONG       nextAvail;     /* offset to next free page in the end of index file */
    ULONG       freePage;      /* offset to next free page inside index file */
    LPCDXLIST   freeLst;       /* list of free pages in index file */
@@ -390,12 +390,12 @@ typedef struct _CDXINDEX
    int         lockRead;      /* number of read lock set */
    HB_FOFFSET  ulLockPos;     /* readlock position for CL53 lock scheme */
 #ifdef HB_CDX_DBGCODE
-   BOOL        RdLck;
-   BOOL        WrLck;
+   HB_BOOL     RdLck;
+   HB_BOOL     WrLck;
 #endif
-   BOOL        fChanged;      /* changes written to index, need upadte ulVersion */
+   HB_BOOL     fChanged;      /* changes written to index, need upadte ulVersion */
    ULONG       ulVersion;     /* network version/update flag */
-   BOOL        fFlush;        /* changes written to index, need upadte ulVersion */
+   HB_BOOL     fFlush;        /* changes written to index, need upadte ulVersion */
 } CDXINDEX;
 typedef CDXINDEX * LPCDXINDEX;
 
@@ -417,8 +417,8 @@ typedef struct
    char *   szTempFileName;   /* temporary file name */
    int      keyLen;           /* key length */
    BYTE     bTrl;             /* filler char for shorter keys */
-   BOOL     fUnique;          /* TRUE if index is unique */
-   BOOL     fReindex;         /* TRUE if reindexing is in process */
+   HB_BOOL  fUnique;          /* HB_TRUE if index is unique */
+   HB_BOOL  fReindex;         /* HB_TRUE if reindexing is in process */
    ULONG    ulMaxRec;         /* the highest record number */
    ULONG    ulTotKeys;        /* total number of keys indexed */
    ULONG    ulKeys;           /* keys in curently created page */
@@ -464,8 +464,8 @@ typedef struct _CDXAREA
    LPCDXSORTINFO  pSort;         /* Index build structure */
    LPCDXINDEX     lpIndexes;     /* Pointer to indexes array  */
    BYTE *         bCdxSortTab;   /* Table with sorted characters */
-   BOOL           fCdxAppend;    /* Appended record changed */
-   BOOL           fSortCDP;      /* Use CDP functions for sorting */
+   HB_BOOL        fCdxAppend;    /* Appended record changed */
+   HB_BOOL        fSortCDP;      /* Use CDP functions for sorting */
    USHORT         uiTag;         /* current tag focus */
 
 } CDXAREA;

harbour/include/hbrdddbf.h

@@ -143,11 +143,11 @@ typedef struct _DBFDATA
    USHORT   uiDirtyRead;      /* HB_IDXREAD_CLEANMASK */
    ULONG    ulMemoBlockSize;  /* 0 */
 
-   BOOL     fSortRecNo;
-   BOOL     fMultiKey;
-   BOOL     fStruct;
-   BOOL     fStrictStruct;
-   BOOL     fMultiTag;
+   HB_BOOL  fSortRecNo;
+   HB_BOOL  fMultiKey;
+   HB_BOOL  fStruct;
+   HB_BOOL  fStrictStruct;
+   HB_BOOL  fMultiTag;
 } DBFDATA, * LPDBFDATA;
 
 typedef struct _HB_DBFFIELDBITS
@@ -199,27 +199,27 @@ typedef struct _DBFAREA
    BYTE *   pRecord;                /* Buffer of record data */
    ULONG    ulRecCount;             /* Total records */
    ULONG    ulRecNo;                /* Current record */
-   BOOL     fAutoInc;               /* WorkArea with auto increment fields */
-   BOOL     fHasMemo;               /* WorkArea with Memo fields */
-   BOOL     fHasTags;               /* WorkArea with MDX or CDX index */
-   BOOL     fModStamp;              /* WorkArea with modification autoupdate fields */
-   BOOL     fDataFlush;             /* data was written to DBF and not commited */
-   BOOL     fMemoFlush;             /* data was written to MEMO and not commited */
-   BOOL     fShared;                /* Shared file */
-   BOOL     fReadonly;              /* Read only file */
-   BOOL     fTemporary;             /* Temporary file */
-   BOOL     fValidBuffer;           /* State of buffer */
-   BOOL     fPositioned;            /* Positioned record */
-   BOOL     fRecordChanged;         /* Record changed */
-   BOOL     fAppend;                /* TRUE if new record is added */
-   BOOL     fDeleted;               /* TRUE if record is deleted */
-   BOOL     fEncrypted;             /* TRUE if record is encrypted */
-   BOOL     fTableEncrypted;        /* TRUE if table is encrypted */
-   BOOL     fUpdateHeader;          /* Update header of file */
-   BOOL     fFLocked;               /* TRUE if file is locked */
-   BOOL     fHeaderLocked;          /* TRUE if DBF header is locked */
-   BOOL     fPackMemo;              /* Pack memo file in pack operation */
-   BOOL     fTrigger;               /* Execute trigger function */
+   HB_BOOL  fAutoInc;               /* WorkArea with auto increment fields */
+   HB_BOOL  fHasMemo;               /* WorkArea with Memo fields */
+   HB_BOOL  fHasTags;               /* WorkArea with MDX or CDX index */
+   HB_BOOL  fModStamp;              /* WorkArea with modification autoupdate fields */
+   HB_BOOL  fDataFlush;             /* data was written to DBF and not commited */
+   HB_BOOL  fMemoFlush;             /* data was written to MEMO and not commited */
+   HB_BOOL  fShared;                /* Shared file */
+   HB_BOOL  fReadonly;              /* Read only file */
+   HB_BOOL  fTemporary;             /* Temporary file */
+   HB_BOOL  fValidBuffer;           /* State of buffer */
+   HB_BOOL  fPositioned;            /* Positioned record */
+   HB_BOOL  fRecordChanged;         /* Record changed */
+   HB_BOOL  fAppend;                /* HB_TRUE if new record is added */
+   HB_BOOL  fDeleted;               /* HB_TRUE if record is deleted */
+   HB_BOOL  fEncrypted;             /* HB_TRUE if record is encrypted */
+   HB_BOOL  fTableEncrypted;        /* HB_TRUE if table is encrypted */
+   HB_BOOL  fUpdateHeader;          /* Update header of file */
+   HB_BOOL  fFLocked;               /* HB_TRUE if file is locked */
+   HB_BOOL  fHeaderLocked;          /* HB_TRUE if DBF header is locked */
+   HB_BOOL  fPackMemo;              /* Pack memo file in pack operation */
+   HB_BOOL  fTrigger;               /* Execute trigger function */
    LPDBOPENINFO lpdbOpenInfo;       /* Pointer to current dbOpenInfo structure in OPEN/CREATE methods */
    LPDBRELINFO lpdbPendingRel;      /* Pointer to parent rel struct */
    ULONG *  pLocksPos;              /* List of records locked */
@@ -246,8 +246,8 @@ extern HB_EXPORT HB_ERRCODE hb_dbfSetMemoData( DBFAREAP pArea, USHORT uiIndex,
                                                ULONG ulBlock, ULONG ulSize,
                                                ULONG ulType );
 extern HB_EXPORT HB_ERRCODE hb_dbfGetEGcode( HB_ERRCODE errCode );
-extern HB_EXPORT BOOL       hb_dbfLockIdxFile( PHB_FILE pFile, BYTE bScheme, USHORT usMode, HB_FOFFSET *pPoolPos );
-extern HB_EXPORT BOOL       hb_dbfLockIdxGetData( BYTE bScheme, HB_FOFFSET *ulPos, HB_FOFFSET *ulPool );
+extern HB_EXPORT HB_BOOL    hb_dbfLockIdxFile( PHB_FILE pFile, BYTE bScheme, USHORT usMode, HB_FOFFSET *pPoolPos );
+extern HB_EXPORT HB_BOOL    hb_dbfLockIdxGetData( BYTE bScheme, HB_FOFFSET *ulPos, HB_FOFFSET *ulPool );
 
 extern HB_EXPORT void hb_dbfTranslateRec( DBFAREAP pArea, BYTE * pBuffer, PHB_CODEPAGE cdp_src, PHB_CODEPAGE cdp_dest );
 

harbour/include/hbrdddel.h

@@ -99,12 +99,12 @@ typedef struct _DELIMAREA
    HB_FOFFSET ulBufferStart;        /* Start offset of read buffer */
    ULONG    ulRecNo;                /* Current record */
    ULONG    ulRecCount;             /* Number of records (in export) */
-   BOOL     fTransRec;              /* Can put whole records */
-   BOOL     fFlush;                 /* Data was written to table and not commited */
-   BOOL     fShared;                /* Shared file */
-   BOOL     fReadonly;              /* Read only file */
-   BOOL     fPositioned;            /* Positioned record */
-   BOOL     fRecordChanged;         /* Record changed */
+   HB_BOOL  fTransRec;              /* Can put whole records */
+   HB_BOOL  fFlush;                 /* Data was written to table and not commited */
+   HB_BOOL  fShared;                /* Shared file */
+   HB_BOOL  fReadonly;              /* Read only file */
+   HB_BOOL  fPositioned;            /* Positioned record */
+   HB_BOOL  fRecordChanged;         /* Record changed */
 } DELIMAREA;
 
 typedef DELIMAREA * LPDELIMAREA;

harbour/include/hbrddfpt.h

@@ -206,9 +206,9 @@ typedef FPTBLOCK * LPFPTBLOCK;
 /* MEMO internal memory structures */
 typedef struct _MEMOGCITEM
 {
-   ULONG ulOffset;                  /* Number of blocks */
-   ULONG ulSize;                    /* Block number */
-   BOOL  fChanged;                  /* Mark the free page as changed */
+   ULONG   ulOffset;                /* Number of blocks */
+   ULONG   ulSize;                  /* Block number */
+   HB_BOOL fChanged;                /* Mark the free page as changed */
 } MEMOGCITEM;
 typedef MEMOGCITEM * LPMEMOGCITEM;
 

harbour/include/hbrddnsx.h

@@ -314,7 +314,7 @@ typedef struct _NSXLEAFPAGE
 } NSXLEAFPAGE;
 typedef NSXLEAFPAGE * LPNSXLEAFPAGE;
 
-#if 0 
+#if 0
 /* meta structures for description only, cannot be compiled due to
    variable member sizes */
 typedef struct _NSXBRANCHKEY
@@ -376,7 +376,7 @@ typedef TREE_STACK * LPTREESTACK;
 typedef struct _HB_PAGEINFO
 {
    ULONG    Page;
-   BOOL     Changed;
+   HB_BOOL  Changed;
    int      iUsed;
    USHORT   uiKeys;
    USHORT   uiOffset;
@@ -409,20 +409,20 @@ typedef struct _TAGINFO
    HB_NSXSCOPE bottom;
 
 
-   BOOL        fUsrDescend;
-   BOOL        AscendKey;
-   BOOL        UniqueKey;
+   HB_BOOL     fUsrDescend;
+   HB_BOOL     AscendKey;
+   HB_BOOL     UniqueKey;
 
-   BOOL        Custom;
-   BOOL        ChgOnly;
-   BOOL        Partial;
-   BOOL        Template;
-   BOOL        MultiKey;
+   HB_BOOL     Custom;
+   HB_BOOL     ChgOnly;
+   HB_BOOL     Partial;
+   HB_BOOL     Template;
+   HB_BOOL     MultiKey;
 
-   BOOL        HdrChanged;
-   BOOL        TagBOF;
-   BOOL        TagEOF;
-   BOOL        HotFor;
+   HB_BOOL     HdrChanged;
+   HB_BOOL     TagBOF;
+   HB_BOOL     TagEOF;
+   HB_BOOL     HotFor;
 
    ULONG       HeadBlock;
    ULONG       RootBlock;
@@ -459,20 +459,20 @@ typedef struct _NSXINDEX
    ULONG       FileSize;      /* index file size */
    struct     _NSXAREA * pArea;
    PHB_FILE    pFile;
-   BOOL        fDelete;       /* delete on close flag */
-   BOOL        fReadonly;
-   BOOL        fShared;
-   BOOL        fFlush;
-   BOOL        LargeFile;
-   BOOL        Changed;
-   BOOL        Update;
-   BOOL        Production;    /* Production index */
+   HB_BOOL     fDelete;       /* delete on close flag */
+   HB_BOOL     fReadonly;
+   HB_BOOL     fShared;
+   HB_BOOL     fFlush;
+   HB_BOOL     LargeFile;
+   HB_BOOL     Changed;
+   HB_BOOL     Update;
+   HB_BOOL     Production;    /* Production index */
    HB_FOFFSET  ulLockPos;     /* readlock position for CL53 lock scheme */
    int         lockWrite;     /* number of write lock set */
    int         lockRead;      /* number of read lock set */
 
    NSXROOTHEADER  HeaderBuff;
-   BOOL        fValidHeader;
+   HB_BOOL     fValidHeader;
    int         iTags;
    LPTAGINFO * lpTags;
 
@@ -507,8 +507,8 @@ typedef struct
    int         keyLen;           /* key length */
    UCHAR       trailChar;        /* index key trail character */
    UCHAR       recSize;          /* record size in leaf keys */
-   BOOL        fUnique;          /* TRUE if index is unique */
-   BOOL        fReindex;         /* TRUE if reindexing is in process */
+   HB_BOOL     fUnique;          /* HB_TRUE if index is unique */
+   HB_BOOL     fReindex;         /* HB_TRUE if reindexing is in process */
    ULONG       ulMaxRec;         /* the highest record number */
    ULONG       ulTotKeys;        /* total number of keys indexed */
    ULONG       ulKeys;           /* keys in curently created page */
@@ -553,8 +553,8 @@ typedef struct _NSXAREA
    *  example.
    */
 
-   BOOL           fIdxAppend;       /* TRUE if new record is added */
-   BOOL           fSetTagNumbers;   /* Tag number should be recreated */
+   HB_BOOL        fIdxAppend;       /* HB_TRUE if new record is added */
+   HB_BOOL        fSetTagNumbers;   /* Tag number should be recreated */
    LPNSXINDEX     lpIndexes;        /* Pointer to list of indexes */
    LPTAGINFO      lpCurTag;         /* Pointer to current order */
    LPNSXSORTINFO  pSort;            /* Index build structure */

harbour/include/hbrddntx.h

@@ -181,7 +181,7 @@ typedef TREE_STACK * LPTREESTACK;
 typedef struct _HB_PAGEINFO
 {
    ULONG    Page;
-   BOOL     Changed;
+   HB_BOOL  Changed;
    int      iUsed;
    USHORT   uiKeys;
    struct  _HB_PAGEINFO * pNext;
@@ -214,21 +214,21 @@ typedef struct _TAGINFO
 
    USHORT      Signature;
 
-   BOOL        fTagName;
-   BOOL        fUsrDescend;
-   BOOL        AscendKey;
-   BOOL        UniqueKey;
+   HB_BOOL     fTagName;
+   HB_BOOL     fUsrDescend;
+   HB_BOOL     AscendKey;
+   HB_BOOL     UniqueKey;
 
-   BOOL        Custom;
-   BOOL        ChgOnly;
-   BOOL        Partial;
-   BOOL        Template;
-   BOOL        MultiKey;
-   BOOL        fSortRec;
+   HB_BOOL     Custom;
+   HB_BOOL     ChgOnly;
+   HB_BOOL     Partial;
+   HB_BOOL     Template;
+   HB_BOOL     MultiKey;
+   HB_BOOL     fSortRec;
 
-   BOOL        HdrChanged;
-   BOOL        TagBOF;
-   BOOL        TagEOF;
+   HB_BOOL     HdrChanged;
+   HB_BOOL     TagBOF;
+   HB_BOOL     TagEOF;
    ULONG       HeadBlock;
    ULONG       RootBlock;
    USHORT      uiNumber;
@@ -243,7 +243,7 @@ typedef struct _TAGINFO
    ULONG       keyCount;
    LPKEYINFO   CurKeyInfo;
    LPKEYINFO   HotKeyInfo;
-   BOOL        HotFor;
+   HB_BOOL     HotFor;
 
    struct     _NTXINDEX * Owner;
 } TAGINFO;
@@ -258,21 +258,21 @@ typedef struct _NTXINDEX
    ULONG       TagBlock;      /* Index attr, next free page */
    struct     _NTXAREA * Owner;
    PHB_FILE    DiskFile;
-   BOOL        fDelete;       /* delete on close flag */
-   BOOL        fReadonly;
-   BOOL        fShared;
-   BOOL        fFlush;
-   BOOL        LargeFile;
-   BOOL        Changed;
-   BOOL        Update;
-   BOOL        Compound;
-   BOOL        Production;    /* Production index */
+   HB_BOOL     fDelete;       /* delete on close flag */
+   HB_BOOL     fReadonly;
+   HB_BOOL     fShared;
+   HB_BOOL     fFlush;
+   HB_BOOL     LargeFile;
+   HB_BOOL     Changed;
+   HB_BOOL     Update;
+   HB_BOOL     Compound;
+   HB_BOOL     Production;    /* Production index */
    HB_FOFFSET  ulLockPos;     /* readlock position for CL53 lock scheme */
    int         lockWrite;     /* number of write lock set */
    int         lockRead;      /* number of read lock set */
 
    BYTE *      HeaderBuff;    /* TODO: make it member */
-   BOOL        fValidHeader;
+   HB_BOOL     fValidHeader;
    int         iTags;
    LPTAGINFO * lpTags;
 
@@ -305,8 +305,8 @@ typedef struct
    HB_FHANDLE hTempFile;      /* handle to temporary file */
    char *   szTempFileName;   /* temporary file name */
    int      keyLen;           /* key length */
-   BOOL     fUnique;          /* TRUE if index is unique */
-   BOOL     fReindex;         /* TRUE if reindexing is in process */
+   HB_BOOL  fUnique;          /* HB_TRUE if index is unique */
+   HB_BOOL  fReindex;         /* HB_TRUE if reindexing is in process */
    ULONG    ulMaxRec;         /* the highest record number */
    ULONG    ulTotKeys;        /* total number of keys indexed */
    ULONG    ulKeys;           /* keys in curently created page */
@@ -350,8 +350,8 @@ typedef struct _NTXAREA
    *  example.
    */
 
-   BOOL           fNtxAppend;       /* TRUE if new record is added */
-   BOOL           fSetTagNumbers;   /* Tag number should be recreated */
+   HB_BOOL        fNtxAppend;       /* HB_TRUE if new record is added */
+   HB_BOOL        fSetTagNumbers;   /* Tag number should be recreated */
    LPNTXINDEX     lpIndexes;        /* Pointer to list of indexes */
    LPTAGINFO      lpCurTag;         /* Pointer to current order */
    LPNTXSORTINFO  pSort;            /* Index build structure */

harbour/include/hbrddsdf.h

@@ -92,12 +92,12 @@ typedef struct _SDFAREA
    HB_FOFFSET ulFileSize;           /* File table size in export mode */
    ULONG    ulRecNo;                /* Current record */
    ULONG    ulRecCount;             /* Number of records (in export) */
-   BOOL     fTransRec;              /* Can put whole records */
-   BOOL     fFlush;                 /* Data was written to SDF and not commited */
-   BOOL     fShared;                /* Shared file */
-   BOOL     fReadonly;              /* Read only file */
-   BOOL     fPositioned;            /* Positioned record */
-   BOOL     fRecordChanged;         /* Record changed */
+   HB_BOOL  fTransRec;              /* Can put whole records */
+   HB_BOOL  fFlush;                 /* Data was written to SDF and not commited */
+   HB_BOOL  fShared;                /* Shared file */
+   HB_BOOL  fReadonly;              /* Read only file */
+   HB_BOOL  fPositioned;            /* Positioned record */
+   HB_BOOL  fRecordChanged;         /* Record changed */
 } SDFAREA;
 
 typedef SDFAREA * LPSDFAREA;

harbour/src/rdd/dbcmd.c

@@ -265,7 +265,7 @@ HB_FUNC( DBF )
 
 HB_FUNC( BOF )
 {
-   BOOL bBof = TRUE;
+   HB_BOOL bBof = HB_TRUE;
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
 
    if( pArea )
@@ -280,11 +280,11 @@ HB_FUNC( DBAPPEND )
 
    if( pArea )
    {
-      BOOL bUnLockAll = hb_parldef( 1, 1 );
+      HB_BOOL bUnLockAll = hb_parldef( 1, 1 );
       HB_ERRCODE errCode;
 
       /* Clipper clears NETERR flag before APPEND */
-      hb_rddSetNetErr( FALSE );
+      hb_rddSetNetErr( HB_FALSE );
       errCode = SELF_APPEND( pArea, bUnLockAll );
       hb_retl( errCode == HB_SUCCESS );
    }
@@ -337,7 +337,7 @@ HB_FUNC( DBCREATE )
    const char * szFileName, * szAlias, * szDriver, * szCpId;
    USHORT uiSize, uiLen;
    PHB_ITEM pStruct, pFieldDesc, pDelim;
-   BOOL fKeepOpen, fCurrArea;
+   HB_BOOL fKeepOpen, fCurrArea;
    ULONG ulConnection;
 
    /*
@@ -464,7 +464,7 @@ HB_FUNC( __DBOPENSDF )
    const char * szFileName, * szAlias, * szDriver, * szCpId;
    USHORT uiSize, uiLen;
    PHB_ITEM pStruct, pFieldDesc, pDelim;
-   BOOL fKeepOpen, fCurrArea;
+   HB_BOOL fKeepOpen, fCurrArea;
    ULONG ulConnection;
    HB_ERRCODE errCode;
 
@@ -511,7 +511,7 @@ HB_FUNC( __DBOPENSDF )
 
    errCode = hb_rddOpenTable( szFileName, szDriver,
                               fCurrArea ? hb_rddGetCurrentWorkAreaNumber() : 0,
-                              szAlias, TRUE, TRUE,
+                              szAlias, HB_TRUE, HB_TRUE,
                               szCpId, ulConnection,
                               pStruct, pDelim );
 
@@ -597,14 +597,14 @@ HB_FUNC( __DBLOCATE )
       dbScopeInfo.itmRecID    = hb_param( 4, HB_IT_NUMERIC );
       dbScopeInfo.fRest       = hb_param( 5, HB_IT_LOGICAL );
 
-      dbScopeInfo.fIgnoreFilter     = TRUE;
-      dbScopeInfo.fIncludeDeleted   = TRUE;
-      dbScopeInfo.fLast             = FALSE;
-      dbScopeInfo.fIgnoreDuplicates = FALSE;
-      dbScopeInfo.fBackward         = FALSE;
+      dbScopeInfo.fIgnoreFilter     = HB_TRUE;
+      dbScopeInfo.fIncludeDeleted   = HB_TRUE;
+      dbScopeInfo.fLast             = HB_FALSE;
+      dbScopeInfo.fIgnoreDuplicates = HB_FALSE;
+      dbScopeInfo.fBackward         = HB_FALSE;
 
       if( SELF_SETLOCATE( pArea, &dbScopeInfo ) == HB_SUCCESS )
-         SELF_LOCATE( pArea, FALSE );
+         SELF_LOCATE( pArea, HB_FALSE );
    }
    else
       hb_errRT_DBCMD( EG_NOTABLE, EG_NOTABLE, NULL, HB_ERR_FUNCNAME );
@@ -633,7 +633,7 @@ HB_FUNC( __DBCONTINUE )
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
 
    if( pArea )
-      SELF_LOCATE( pArea, TRUE );
+      SELF_LOCATE( pArea, HB_TRUE );
    else
       hb_errRT_DBCMD( EG_NOTABLE, EDBCMD_NOTABLE, NULL, HB_ERR_FUNCNAME );
 }
@@ -692,7 +692,7 @@ HB_FUNC( DBRLOCK )
    if( pArea )
    {
       DBLOCKINFO dbLockInfo;
-      dbLockInfo.fResult = FALSE;
+      dbLockInfo.fResult = HB_FALSE;
       dbLockInfo.itmRecID = hb_param( 1, HB_IT_ANY );
       if( !dbLockInfo.itmRecID || HB_ISNIL( 1 ) )
          dbLockInfo.uiMethod = DBLM_EXCLUSIVE;
@@ -739,12 +739,12 @@ HB_FUNC( DBSEEK )
       if( ! HB_ISNIL( 1 ) )
       {
          PHB_ITEM pKey = hb_param( 1, HB_IT_ANY );
-         BOOL bSoftSeek = HB_ISLOG( 2 ) ? ( BOOL ) hb_parl( 2 ) : hb_setGetSoftSeek();
-         BOOL bFindLast = hb_parl( 3 ), fFound = FALSE;
+         HB_BOOL bSoftSeek = HB_ISLOG( 2 ) ? ( HB_BOOL ) hb_parl( 2 ) : hb_setGetSoftSeek();
+         HB_BOOL bFindLast = hb_parl( 3 ), fFound = HB_FALSE;
          if( SELF_SEEK( pArea, bSoftSeek, pKey, bFindLast ) == HB_SUCCESS )
          {
             if( SELF_FOUND( pArea, &fFound ) != HB_SUCCESS )
-               fFound = FALSE;
+               fFound = HB_FALSE;
          }
          hb_retl( fFound );
       }
@@ -814,9 +814,9 @@ HB_FUNC( DBSETFILTER )
             pFilterInfo.abFilterText = pText;
          else
             pFilterInfo.abFilterText = hb_itemPutC( NULL, NULL );
-         pFilterInfo.fFilter = TRUE;
+         pFilterInfo.fFilter = HB_TRUE;
          pFilterInfo.lpvCargo = NULL;
-         pFilterInfo.fOptimized = FALSE;
+         pFilterInfo.fOptimized = HB_FALSE;
          SELF_SETFILTER( pArea, &pFilterInfo );
          if( !pText )
             hb_itemRelease( pFilterInfo.abFilterText );
@@ -912,7 +912,7 @@ HB_FUNC( __DBZAP )
 
 HB_FUNC( DELETED )
 {
-   BOOL bDeleted = FALSE;
+   HB_BOOL bDeleted = HB_FALSE;
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
 
    if( pArea )
@@ -922,7 +922,7 @@ HB_FUNC( DELETED )
 
 HB_FUNC( EOF )
 {
-   BOOL bEof = TRUE;
+   HB_BOOL bEof = HB_TRUE;
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
 
    if( pArea )
@@ -1017,7 +1017,7 @@ HB_FUNC( FLOCK )
    if( pArea )
    {
       DBLOCKINFO dbLockInfo;
-      dbLockInfo.fResult = FALSE;
+      dbLockInfo.fResult = HB_FALSE;
       dbLockInfo.itmRecID = NULL;
       dbLockInfo.uiMethod = DBLM_FILE;
       SELF_LOCK( pArea, &dbLockInfo );
@@ -1029,7 +1029,7 @@ HB_FUNC( FLOCK )
 
 HB_FUNC( FOUND )
 {
-   BOOL bFound = FALSE;
+   HB_BOOL bFound = HB_FALSE;
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
 
    if( pArea )
@@ -1087,7 +1087,7 @@ HB_FUNC( LOCK )
    if( pArea )
    {
       DBLOCKINFO dbLockInfo;
-      dbLockInfo.fResult = FALSE;
+      dbLockInfo.fResult = HB_FALSE;
       dbLockInfo.itmRecID = NULL;
       dbLockInfo.uiMethod = DBLM_EXCLUSIVE;
       SELF_LOCK( pArea, &dbLockInfo );
@@ -1236,11 +1236,11 @@ HB_FUNC( ORDCONDSET )
       lpdbOrdCondInfo->fExclusive    = hb_parl( 20 );
 
       if( lpdbOrdCondInfo->itmCobWhile )
-         lpdbOrdCondInfo->fRest = TRUE;
+         lpdbOrdCondInfo->fRest = HB_TRUE;
       if( lpdbOrdCondInfo->lNextCount || lpdbOrdCondInfo->itmRecID ||
                lpdbOrdCondInfo->fRest || lpdbOrdCondInfo->fUseCurrent ||
           lpdbOrdCondInfo->fUseFilter )
-         lpdbOrdCondInfo->fAll = FALSE;
+         lpdbOrdCondInfo->fAll = HB_FALSE;
 
       lpdbOrdCondInfo->fActive = !lpdbOrdCondInfo->fAll ||
                lpdbOrdCondInfo->abFor || lpdbOrdCondInfo->itmCobFor ||
@@ -1254,7 +1254,7 @@ HB_FUNC( ORDCONDSET )
       hb_retl( SELF_ORDSETCOND( pArea, lpdbOrdCondInfo ) == HB_SUCCESS );
    }
    else
-      hb_retl( FALSE );
+      hb_retl( HB_FALSE );
 }
 
 HB_FUNC( ORDCREATE )
@@ -1270,7 +1270,7 @@ HB_FUNC( ORDCREATE )
       dbOrderInfo.abBagName = hb_parcx( 1 );
       dbOrderInfo.atomBagName = hb_parcx( 2 );
       dbOrderInfo.itmOrder = NULL;
-      dbOrderInfo.fUnique = HB_ISLOG( 5 ) ? ( BOOL ) hb_parl( 5 ) : hb_setGetUnique();
+      dbOrderInfo.fUnique = HB_ISLOG( 5 ) ? ( HB_BOOL ) hb_parl( 5 ) : hb_setGetUnique();
       dbOrderInfo.abExpr = hb_param( 3, HB_IT_STRING );
       if( ( ( dbOrderInfo.abBagName == NULL || dbOrderInfo.abBagName[ 0 ] == 0 ) &&
             ( dbOrderInfo.atomBagName == NULL || dbOrderInfo.atomBagName[ 0 ] == 0 ) ) ||
@@ -1314,7 +1314,7 @@ HB_FUNC( ORDBAGCLEAR )
       hb_retl( SELF_ORDLSTDELETE( pArea, &pOrderInfo ) == HB_SUCCESS );
    }
    else
-      hb_retl( FALSE );
+      hb_retl( HB_FALSE );
 }
 
 HB_FUNC( ORDDESTROY )
@@ -1332,7 +1332,7 @@ HB_FUNC( ORDDESTROY )
       hb_retl( SELF_ORDDESTROY( pArea, &pOrderInfo ) == HB_SUCCESS );
    }
    else
-      hb_retl( FALSE );
+      hb_retl( HB_FALSE );
 }
 
 HB_FUNC( ORDFOR )
@@ -1362,7 +1362,7 @@ HB_FUNC( ORDFOR )
       pOrderInfo.itmNewVal = hb_param( 3, HB_IT_STRING );
       pOrderInfo.itmResult = hb_itemPutC( NULL, NULL );
       pOrderInfo.itmCobExpr = NULL;
-      pOrderInfo.fAllTags = FALSE;
+      pOrderInfo.fAllTags = HB_FALSE;
       SELF_ORDINFO( pArea, DBOI_CONDITION, &pOrderInfo );
       hb_itemReturnRelease( pOrderInfo.itmResult );
    }
@@ -1413,7 +1413,7 @@ HB_FUNC( ORDLISTADD )
       HB_ERRCODE errCode;
 
       /* Clipper clears NETERR flag when index is open */
-      hb_rddSetNetErr( FALSE );
+      hb_rddSetNetErr( HB_FALSE );
 
       memset( &pOrderInfo, 0, sizeof( DBORDERINFO ) );
       pOrderInfo.atomBagName = hb_param( 1, HB_IT_STRING );
@@ -1624,7 +1624,7 @@ HB_FUNC( RLOCK )
    if( pArea )
    {
       DBLOCKINFO dbLockInfo;
-      dbLockInfo.fResult = FALSE;
+      dbLockInfo.fResult = HB_FALSE;
       dbLockInfo.itmRecID = NULL;
       dbLockInfo.uiMethod = DBLM_EXCLUSIVE;
       SELF_LOCK( pArea, &dbLockInfo );
@@ -1804,7 +1804,7 @@ HB_FUNC( DBSETRELATION )
       dbRelations.itmCobExpr = hb_itemNew( hb_param( 2, HB_IT_BLOCK ) );
       dbRelations.abKey = hb_itemNew( hb_param( 3, HB_IT_STRING ) );
       dbRelations.isScoped = hb_parl( 4 );
-      dbRelations.isOptimized = FALSE;
+      dbRelations.isOptimized = HB_FALSE;
       dbRelations.lpaChild = pChildArea;
       dbRelations.lpaParent = pArea;
       dbRelations.lpdbriNext = NULL;
@@ -1878,8 +1878,8 @@ HB_FUNC( __DBARRANGE )
       dbSortInfo.dbtri.dbsci.fLast =
       dbSortInfo.dbtri.dbsci.fIgnoreDuplicates =
       dbSortInfo.dbtri.dbsci.fBackward =
-      dbSortInfo.dbtri.dbsci.fOptimized = FALSE;
-      dbSortInfo.dbtri.dbsci.fIncludeDeleted = TRUE;
+      dbSortInfo.dbtri.dbsci.fOptimized = HB_FALSE;
+      dbSortInfo.dbtri.dbsci.fIncludeDeleted = HB_TRUE;
 
       pFields = hb_param( 8, HB_IT_ARRAY );
       dbSortInfo.uiItemCount = pFields ? ( USHORT ) hb_arrayLen( pFields ) : 0;
@@ -1979,11 +1979,11 @@ HB_FUNC( __DBTRANS )
             dbTransInfo.dbsci.itmRecID    = HB_ISNIL( 6 ) ? NULL : hb_param( 6, HB_IT_ANY );
             dbTransInfo.dbsci.fRest       = hb_param( 7, HB_IT_LOGICAL );
 
-            dbTransInfo.dbsci.fIgnoreFilter     = TRUE;
-            dbTransInfo.dbsci.fIncludeDeleted   = TRUE;
-            dbTransInfo.dbsci.fLast             = FALSE;
-            dbTransInfo.dbsci.fIgnoreDuplicates = FALSE;
-            dbTransInfo.dbsci.fBackward         = FALSE;
+            dbTransInfo.dbsci.fIgnoreFilter     = HB_TRUE;
+            dbTransInfo.dbsci.fIncludeDeleted   = HB_TRUE;
+            dbTransInfo.dbsci.fLast             = HB_FALSE;
+            dbTransInfo.dbsci.fIgnoreDuplicates = HB_FALSE;
+            dbTransInfo.dbsci.fBackward         = HB_FALSE;
 
             errCode = SELF_TRANS( dbTransInfo.lpaSource, &dbTransInfo );
          }
@@ -2011,7 +2011,7 @@ HB_FUNC( __DBAPP )
                hb_parc( 8 ),                     /* RDD */
                hb_parnl( 9 ),                    /* connection */
                hb_param( 2, HB_IT_ARRAY ),       /* Fields */
-               FALSE,                            /* Export? */
+               HB_FALSE,                         /* Export? */
                hb_param( 3, HB_IT_BLOCK ),       /* cobFor */
                NULL,                             /* lpStrFor */
                hb_param( 4, HB_IT_BLOCK ),       /* cobWhile */
@@ -2034,7 +2034,7 @@ HB_FUNC( __DBCOPY )
                hb_parc( 8 ),                     /* RDD */
                hb_parnl( 9 ),                    /* connection */
                hb_param( 2, HB_IT_ARRAY ),       /* Fields */
-               TRUE,                             /* Export? */
+               HB_TRUE,                          /* Export? */
                hb_param( 3, HB_IT_BLOCK ),       /* cobFor */
                NULL,                             /* lpStrFor */
                hb_param( 4, HB_IT_BLOCK ),       /* cobWhile */

harbour/src/rdd/dbcmd53.c

@@ -124,7 +124,7 @@ HB_FUNC( ORDKEYGOTO )
       DBORDERINFO pOrderInfo;
       memset( &pOrderInfo, 0, sizeof( DBORDERINFO ) );
       pOrderInfo.itmNewVal = hb_param( 1 , HB_IT_NUMERIC );
-      pOrderInfo.itmResult = hb_itemPutL( NULL, FALSE );
+      pOrderInfo.itmResult = hb_itemPutL( NULL, HB_FALSE );
       SELF_ORDINFO( pArea, DBOI_POSITION, &pOrderInfo );
       hb_itemReturnRelease( pOrderInfo.itmResult );
    }
@@ -158,7 +158,7 @@ HB_FUNC( ORDFINDREC )
       DBORDERINFO pOrderInfo;
       memset( &pOrderInfo, 0, sizeof( DBORDERINFO ) );
       pOrderInfo.itmNewVal = hb_param( 1 , HB_IT_NUMERIC );
-      pOrderInfo.itmResult = hb_itemPutL( NULL, FALSE );
+      pOrderInfo.itmResult = hb_itemPutL( NULL, HB_FALSE );
       SELF_ORDINFO( pArea, hb_parl( 2 ) ? DBOI_FINDRECCONT :
                                           DBOI_FINDREC, &pOrderInfo );
       hb_itemReturnRelease( pOrderInfo.itmResult );
@@ -186,7 +186,7 @@ HB_FUNC( ORDSKIPUNIQUE )
       DBORDERINFO pOrderInfo;
       memset( &pOrderInfo, 0, sizeof( DBORDERINFO ) );
       pOrderInfo.itmNewVal = hb_param( 1, HB_IT_ANY );
-      pOrderInfo.itmResult = hb_itemPutL( NULL, FALSE );
+      pOrderInfo.itmResult = hb_itemPutL( NULL, HB_FALSE );
       SELF_ORDINFO( pArea, DBOI_SKIPUNIQUE, &pOrderInfo );
       hb_itemReturnRelease( pOrderInfo.itmResult );
    }
@@ -268,7 +268,7 @@ HB_FUNC( ORDDESCEND )
       pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
       /* Either or both may be NIL */
       pOrderInfo.itmNewVal = hb_param( 3 , HB_IT_LOGICAL );
-      pOrderInfo.itmResult = hb_itemPutL( NULL, FALSE );
+      pOrderInfo.itmResult = hb_itemPutL( NULL, HB_FALSE );
       SELF_ORDINFO( pArea, DBOI_ISDESC, &pOrderInfo );
       hb_itemReturnRelease( pOrderInfo.itmResult );
    }
@@ -290,7 +290,7 @@ HB_FUNC( ORDISUNIQUE )
       pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
       /* HARBOUR extension: NewVal to set/reset unique flag */
       pOrderInfo.itmNewVal = hb_param( 3 , HB_IT_LOGICAL );
-      pOrderInfo.itmResult = hb_itemPutL( NULL, FALSE );
+      pOrderInfo.itmResult = hb_itemPutL( NULL, HB_FALSE );
       SELF_ORDINFO( pArea, DBOI_UNIQUE, &pOrderInfo );
       hb_itemReturnRelease( pOrderInfo.itmResult );
    }
@@ -312,7 +312,7 @@ HB_FUNC( ORDCUSTOM )
       pOrderInfo.atomBagName = hb_param( 2, HB_IT_STRING );
       /* Either or both may be NIL */
       pOrderInfo.itmNewVal = hb_param( 3 , HB_IT_LOGICAL );
-      pOrderInfo.itmResult = hb_itemPutL( NULL, FALSE );
+      pOrderInfo.itmResult = hb_itemPutL( NULL, HB_FALSE );
       SELF_ORDINFO( pArea, DBOI_CUSTOM, &pOrderInfo );
       hb_itemReturnRelease( pOrderInfo.itmResult );
    }
@@ -383,7 +383,7 @@ HB_FUNC( DBORDERINFO )
          pOrderInfo.itmNewVal = hb_param( 4 , HB_IT_ANY );
          pOrderInfo.itmResult = hb_itemNew( NULL );
          pOrderInfo.itmCobExpr = NULL;
-         pOrderInfo.fAllTags = FALSE;
+         pOrderInfo.fAllTags = HB_FALSE;
          SELF_ORDINFO( pArea, hb_itemGetNI( pType ), &pOrderInfo );
          hb_itemReturnRelease( pOrderInfo.itmResult );
       }

harbour/src/rdd/dbdetach.c

@@ -102,7 +102,7 @@ HB_FUNC( HB_DBREQUEST )
 {
    const char * szAlias;
    PHB_ITEM pCargo;
-   BOOL fNewArea, fWait;
+   HB_BOOL fNewArea, fWait;
    AREAP pArea;
 
    if( HB_ISNIL( 1 ) || HB_ISCHAR( 1 ) )

harbour/src/rdd/dbffpt/dbffpt1.c

@@ -143,13 +143,13 @@ static const char * hb_memoDefaultFileExt( int iType, USHORT uiRdd )
 /*
  * Exclusive lock memo file.
  */
-static BOOL hb_fptFileLockEx( FPTAREAP pArea, BOOL fWait )
+static HB_BOOL hb_fptFileLockEx( FPTAREAP pArea, HB_BOOL fWait )
 {
-   BOOL fRet;
+   HB_BOOL fRet;
 
    if( !pArea->fShared )
    {
-      fRet = TRUE;
+      fRet = HB_TRUE;
    }
    else
    {
@@ -168,13 +168,13 @@ static BOOL hb_fptFileLockEx( FPTAREAP pArea, BOOL fWait )
 /*
  * Shared lock memo file.
  */
-static BOOL hb_fptFileLockSh( FPTAREAP pArea, BOOL fWait )
+static HB_BOOL hb_fptFileLockSh( FPTAREAP pArea, HB_BOOL fWait )
 {
-   BOOL fRet;
+   HB_BOOL fRet;
 
    if( !pArea->fShared )
    {
-      fRet = TRUE;
+      fRet = HB_TRUE;
    }
    else
    {
@@ -193,7 +193,7 @@ static BOOL hb_fptFileLockSh( FPTAREAP pArea, BOOL fWait )
 /*
  * Unlock memo file.
  */
-static BOOL hb_fptFileUnLock( FPTAREAP pArea )
+static HB_BOOL hb_fptFileUnLock( FPTAREAP pArea )
 {
    return !pArea->fShared || hb_fileLock( pArea->pMemoFile, FPT_LOCKPOS, FPT_LOCKSIZE, FL_UNLOCK );
 }
@@ -201,7 +201,7 @@ static BOOL hb_fptFileUnLock( FPTAREAP pArea )
 /*
  * Check if MEMO file has direct access to data
  */
-static BOOL hb_fptHasDirectAccess( FPTAREAP pArea )
+static HB_BOOL hb_fptHasDirectAccess( FPTAREAP pArea )
 {
    return pArea->bMemoType == DB_MEMO_FPT &&
           ( pArea->uiMemoVersion == DB_MEMOVER_FLEX ||
@@ -211,12 +211,12 @@ static BOOL hb_fptHasDirectAccess( FPTAREAP pArea )
 /*
  * Lock root block pointer.
  */
-static BOOL hb_fptRootBlockLock( FPTAREAP pArea )
+static HB_BOOL hb_fptRootBlockLock( FPTAREAP pArea )
 {
-   BOOL fRet;
+   HB_BOOL fRet;
 
    if( !pArea->fShared )
-      fRet = TRUE;
+      fRet = HB_TRUE;
    else
       fRet = hb_fileLock( pArea->pMemoFile, FPT_ROOTBLOCK_OFFSET, 4,
                           FL_LOCK | FLX_EXCLUSIVE );
@@ -226,7 +226,7 @@ static BOOL hb_fptRootBlockLock( FPTAREAP pArea )
 /*
  * Unlock root block pointer.
  */
-static BOOL hb_fptRootBlockUnLock( FPTAREAP pArea )
+static HB_BOOL hb_fptRootBlockUnLock( FPTAREAP pArea )
 {
    return !pArea->fShared ||
           hb_fileLock( pArea->pMemoFile, FPT_ROOTBLOCK_OFFSET, 4, FL_UNLOCK );
@@ -348,7 +348,7 @@ static HB_ERRCODE hb_fptPutRootBlock( FPTAREAP pArea, ULONG ulBlock )
 static void hb_fptSortGCitems( LPMEMOGCTABLE pGCtable )
 {
    ULONG ulOffset, ulSize;
-   BOOL fChanged, fMoved = TRUE;
+   HB_BOOL fChanged, fMoved = HB_TRUE;
    int i, j, l;
 
    /* this table should be allready quite good sorted so this simple
@@ -357,7 +357,7 @@ static void hb_fptSortGCitems( LPMEMOGCTABLE pGCtable )
    l = pGCtable->usItems - 1;
    while( fMoved )
    {
-      fMoved = FALSE;
+      fMoved = HB_FALSE;
       j = l;
       for( i = 0; i < j; i++ )
       {
@@ -372,7 +372,7 @@ static void hb_fptSortGCitems( LPMEMOGCTABLE pGCtable )
             pGCtable->pGCitems[ i ].ulSize   = ulSize;
             pGCtable->pGCitems[ i ].ulOffset = ulOffset;
             pGCtable->pGCitems[ i ].fChanged = fChanged;
-            fMoved = TRUE;
+            fMoved = HB_TRUE;
             pGCtable->bChanged |= 2;
             l = i;
          }
@@ -410,7 +410,7 @@ static void hb_fptPackGCitems( LPMEMOGCTABLE pGCtable )
                if( ulEnd == pGCtable->pGCitems[j].ulOffset )
                {
                   pGCtable->pGCitems[i].ulSize  += pGCtable->pGCitems[j].ulSize;
-                  pGCtable->pGCitems[i].fChanged = TRUE;
+                  pGCtable->pGCitems[i].fChanged = HB_TRUE;
                   pGCtable->pGCitems[j].ulOffset = pGCtable->pGCitems[j].ulSize = 0;
                   pGCtable->bChanged |= 2;
                   i = -1;
@@ -487,9 +487,9 @@ static HB_ERRCODE hb_fptWriteGCitems( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, US
             {
                errCode = EDBF_WRITE;
             }
-            pArea->fMemoFlush = TRUE;
+            pArea->fMemoFlush = HB_TRUE;
          }
-         pGCtable->pGCitems[i].fChanged = FALSE;
+         pGCtable->pGCitems[i].fChanged = HB_FALSE;
       }
    }
    return errCode;
@@ -499,7 +499,7 @@ static HB_ERRCODE hb_fptWriteGCitems( FPTAREAP pArea, LPMEMOGCTABLE pGCtable, US
  * Add new block to GC free memo blocks list.
  */
 static HB_ERRCODE hb_fptGCfreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable,
-                                     ULONG ulOffset, ULONG ulByteSize, BOOL fRaw )
+                                     ULONG ulOffset, ULONG ulByteSize, HB_BOOL fRaw )
 {
    HB_ERRCODE errCode = HB_SUCCESS;
    ULONG ulSize;
@@ -542,7 +542,7 @@ static HB_ERRCODE hb_fptGCfreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable,
    }
    else
    {
-      BOOL fChanged = FALSE;
+      HB_BOOL fChanged = HB_FALSE;
       int i;
 
       for( i = 0; i < pGCtable->usItems; i++ )
@@ -551,14 +551,14 @@ static HB_ERRCODE hb_fptGCfreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable,
          {
             ulOffset = pGCtable->pGCitems[i].ulOffset;
             ulSize   = pGCtable->pGCitems[i].ulSize += ulSize;
-            fChanged = pGCtable->pGCitems[i].fChanged = TRUE;
+            fChanged = pGCtable->pGCitems[i].fChanged = HB_TRUE;
             break;
          }
          if( pGCtable->pGCitems[i].ulOffset == ulOffset + ulSize )
          {
             pGCtable->pGCitems[i].ulOffset = ulOffset;
             ulSize   = pGCtable->pGCitems[i].ulSize += ulSize;
-            fChanged = pGCtable->pGCitems[i].fChanged = TRUE;
+            fChanged = pGCtable->pGCitems[i].fChanged = HB_TRUE;
             break;
          }
       }
@@ -572,7 +572,7 @@ static HB_ERRCODE hb_fptGCfreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable,
             }
             pGCtable->pGCitems[ pGCtable->usItems ].ulOffset = ulOffset;
             pGCtable->pGCitems[ pGCtable->usItems ].ulSize = ulSize;
-            pGCtable->pGCitems[ pGCtable->usItems ].fChanged = fChanged = TRUE;
+            pGCtable->pGCitems[ pGCtable->usItems ].fChanged = fChanged = HB_TRUE;
             pGCtable->usItems++;
          }
          else if( pGCtable->pGCitems[ 0 ].ulSize < ulSize )
@@ -588,7 +588,7 @@ static HB_ERRCODE hb_fptGCfreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable,
             }
             pGCtable->pGCitems[ 0 ].ulOffset = ulOffset;
             pGCtable->pGCitems[ 0 ].ulSize = ulSize;
-            pGCtable->pGCitems[ 0 ].fChanged = fChanged = TRUE;
+            pGCtable->pGCitems[ 0 ].fChanged = fChanged = HB_TRUE;
          }
       }
 
@@ -607,10 +607,10 @@ static HB_ERRCODE hb_fptGCfreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable,
  * Get free memo block from GC free memo blocks list or allocate new one.
  */
 static HB_ERRCODE hb_fptGCgetFreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable,
-                                     ULONG * ulOffset, ULONG ulByteSize,
-                                     BOOL fRaw )
+                                        ULONG * ulOffset, ULONG ulByteSize,
+                                        HB_BOOL fRaw )
 {
-   BOOL fAlloc = FALSE;
+   HB_BOOL fAlloc = HB_FALSE;
    ULONG ulSize;
    int i;
 
@@ -654,11 +654,11 @@ static HB_ERRCODE hb_fptGCgetFreeBlock( FPTAREAP pArea, LPMEMOGCTABLE pGCtable,
          }
          else
          {
-            pGCtable->pGCitems[i].fChanged = TRUE;
+            pGCtable->pGCitems[i].fChanged = HB_TRUE;
             hb_fptSortGCitems( pGCtable );
          }
          pGCtable->bChanged |= 2;
-         fAlloc = TRUE;
+         fAlloc = HB_TRUE;
          break;
       }
    }
@@ -729,7 +729,7 @@ static HB_ERRCODE hb_fptReadGCdata( FPTAREAP pArea, LPMEMOGCTABLE pGCtable )
          {
             pGCtable->pGCitems[i].ulSize = HB_GET_LE_UINT16( &pGCtable->fptHeader.reserved2[ i * 6 ] );
             pGCtable->pGCitems[i].ulOffset = HB_GET_LE_UINT32( &pGCtable->fptHeader.reserved2[ i * 6 + 2 ] );
-            pGCtable->pGCitems[i].fChanged = FALSE;
+            pGCtable->pGCitems[i].fChanged = HB_FALSE;
          }
       }
       else if( pArea->bMemoType == DB_MEMO_FPT &&
@@ -775,7 +775,7 @@ static HB_ERRCODE hb_fptReadGCdata( FPTAREAP pArea, LPMEMOGCTABLE pGCtable )
                                                       pArea->ulMemoBlockSize;
                pGCtable->pGCitems[i].ulSize = HB_GET_LE_UINT32( &bPageBuf[ i * 8 + 6 ] ) /
                                                       pArea->ulMemoBlockSize;
-               pGCtable->pGCitems[i].fChanged = FALSE;
+               pGCtable->pGCitems[i].fChanged = HB_FALSE;
             }
             hb_xfree( bPageBuf );
          }
@@ -844,12 +844,12 @@ static HB_ERRCODE hb_fptWriteGCdata( FPTAREAP pArea, LPMEMOGCTABLE pGCtable )
          {
             pGCtable->ulSize = FLEXGCPAGE_SIZE;
             errCode = hb_fptGCgetFreeBlock( pArea, pGCtable,
-                                &pGCtable->ulDirPage, pGCtable->ulSize, FALSE );
+                                &pGCtable->ulDirPage, pGCtable->ulSize, HB_FALSE );
             if( errCode == HB_SUCCESS )
             {
                pGCtable->ulDirPage *= pArea->ulMemoBlockSize;
                errCode = hb_fptGCgetFreeBlock( pArea, pGCtable,
-                                &pGCtable->ulRevPage, pGCtable->ulSize, FALSE );
+                                &pGCtable->ulRevPage, pGCtable->ulSize, HB_FALSE );
                pGCtable->ulRevPage *= pArea->ulMemoBlockSize;
             }
             pGCtable->bChanged |= 2;
@@ -929,7 +929,7 @@ static HB_ERRCODE hb_fptWriteGCdata( FPTAREAP pArea, LPMEMOGCTABLE pGCtable )
             hb_fileTruncAt( pArea->pMemoFile, FPT_BLOCK_OFFSET( pGCtable->ulNextBlock ) );
          }
       }
-      pArea->fMemoFlush = TRUE;
+      pArea->fMemoFlush = HB_TRUE;
       pGCtable->bChanged = 0;
    }
    return errCode;
@@ -1090,7 +1090,7 @@ static const char * hb_fptGetMemoType( FPTAREAP pArea, USHORT uiIndex )
  * Calculate the size of SMT memo item
  */
 static ULONG hb_fptCountSMTItemLength( FPTAREAP pArea, PHB_ITEM pItem,
-                                       ULONG * pulArrayCount, BOOL fTrans )
+                                       ULONG * pulArrayCount, HB_BOOL fTrans )
 {
    ULONG ulLen, u, ulSize;
 
@@ -1210,7 +1210,7 @@ static HB_ERRCODE hb_fptCountSMTDataLength( FPTAREAP pArea, HB_FOFFSET * pfOffse
 /*
  * Write VM item as SMT memos.
  */
-static ULONG hb_fptStoreSMTItem( FPTAREAP pArea, PHB_ITEM pItem, BYTE ** bBufPtr, BOOL fTrans )
+static ULONG hb_fptStoreSMTItem( FPTAREAP pArea, PHB_ITEM pItem, BYTE ** bBufPtr, HB_BOOL fTrans )
 {
    ULONG ulLen, u, ulSize = 0;
    HB_LONG iVal;
@@ -1305,7 +1305,7 @@ static ULONG hb_fptStoreSMTItem( FPTAREAP pArea, PHB_ITEM pItem, BYTE ** bBufPtr
 /*
  * Read SMT item from file
  */
-static HB_ERRCODE hb_fptReadRawSMTItem( FPTAREAP pArea, PHB_ITEM pItem, HB_FOFFSET *pfOffset, BOOL fTrans )
+static HB_ERRCODE hb_fptReadRawSMTItem( FPTAREAP pArea, PHB_ITEM pItem, HB_FOFFSET *pfOffset, HB_BOOL fTrans )
 {
    ULONG ulLen, u;
    BYTE buffer[ 10 ];
@@ -1402,7 +1402,7 @@ static HB_ERRCODE hb_fptReadRawSMTItem( FPTAREAP pArea, PHB_ITEM pItem, HB_FOFFS
 /*
  * Read SMT item from memory buffer.
  */
-static HB_ERRCODE hb_fptReadSMTItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBufEnd, PHB_ITEM pItem, BOOL fTrans )
+static HB_ERRCODE hb_fptReadSMTItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBufEnd, PHB_ITEM pItem, HB_BOOL fTrans )
 {
    ULONG ulLen, u;
    HB_ERRCODE errCode = HB_SUCCESS;
@@ -1526,7 +1526,7 @@ static HB_ERRCODE hb_fptReadSMTItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * b
  * Calculate the size of SIX memo item
  */
 static ULONG hb_fptCountSixItemLength( FPTAREAP pArea, PHB_ITEM pItem,
-                                       ULONG * pulArrayCount, BOOL fTrans )
+                                       ULONG * pulArrayCount, HB_BOOL fTrans )
 {
    ULONG ulLen, u, ulSize;
 
@@ -1579,7 +1579,7 @@ static ULONG hb_fptCountSixItemLength( FPTAREAP pArea, PHB_ITEM pItem,
 /*
  * Write fpt vartype as SIX memos.
  */
-static ULONG hb_fptStoreSixItem( FPTAREAP pArea, PHB_ITEM pItem, BYTE ** bBufPtr, BOOL fTrans )
+static ULONG hb_fptStoreSixItem( FPTAREAP pArea, PHB_ITEM pItem, BYTE ** bBufPtr, HB_BOOL fTrans )
 {
    ULONG ulLen, u, ulSize;
    HB_LONG iVal;
@@ -1689,7 +1689,7 @@ static ULONG hb_fptStoreSixItem( FPTAREAP pArea, PHB_ITEM pItem, BYTE ** bBufPtr
 /*
  * Read SIX item from memo.
  */
-static HB_ERRCODE hb_fptReadSixItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBufEnd, PHB_ITEM pItem, BOOL fTrans )
+static HB_ERRCODE hb_fptReadSixItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBufEnd, PHB_ITEM pItem, HB_BOOL fTrans )
 {
    USHORT usType;
    ULONG ulLen, u;
@@ -1791,7 +1791,7 @@ static HB_ERRCODE hb_fptReadSixItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * b
  * Calculate the size of FLEX memo item
  */
 static ULONG hb_fptCountFlexItemLength( FPTAREAP pArea, PHB_ITEM pItem,
-                                        ULONG * pulArrayCount, BOOL fTrans )
+                                        ULONG * pulArrayCount, HB_BOOL fTrans )
 {
    ULONG ulLen, u, ulSize = 1;
    HB_LONG iVal;
@@ -1844,7 +1844,7 @@ static ULONG hb_fptCountFlexItemLength( FPTAREAP pArea, PHB_ITEM pItem,
 /*
  * Store in buffer fpt vartype as FLEX memos.
  */
-static void hb_fptStoreFlexItem( FPTAREAP pArea, PHB_ITEM pItem, BYTE ** bBufPtr, BOOL fTrans )
+static void hb_fptStoreFlexItem( FPTAREAP pArea, PHB_ITEM pItem, BYTE ** bBufPtr, HB_BOOL fTrans )
 {
    ULONG ulLen, u;
    HB_LONG iVal;
@@ -1956,7 +1956,7 @@ static void hb_fptStoreFlexItem( FPTAREAP pArea, PHB_ITEM pItem, BYTE ** bBufPtr
 /*
  * Read FLEX item from memo.
  */
-static HB_ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBufEnd, PHB_ITEM pItem, BOOL bRoot, BOOL fTrans )
+static HB_ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBufEnd, PHB_ITEM pItem, HB_BOOL bRoot, HB_BOOL fTrans )
 {
    BYTE usType;
    ULONG ulLen, i;
@@ -1980,10 +1980,10 @@ static HB_ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE *
          hb_itemClear( pItem );
          break;
       case FPTIT_FLEXAR_TRUE:
-         hb_itemPutL( pItem, TRUE );
+         hb_itemPutL( pItem, HB_TRUE );
          break;
       case FPTIT_FLEXAR_FALSE:
-         hb_itemPutL( pItem, FALSE );
+         hb_itemPutL( pItem, HB_FALSE );
          break;
       case FPTIT_FLEXAR_LOGIC:
          if( bBufEnd - (*pbMemoBuf) >= 1 )
@@ -2319,7 +2319,7 @@ static HB_ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE *
                for( i = 1; i <= ulLen; i++ )
                {
                   errCode = hb_fptReadFlexItem( pArea, pbMemoBuf, bBufEnd,
-                                    hb_arrayGetItemPtr( pItem, i ), FALSE, fTrans );
+                                    hb_arrayGetItemPtr( pItem, i ), HB_FALSE, fTrans );
                   if( errCode != HB_SUCCESS )
                   {
                      break;
@@ -2481,7 +2481,7 @@ static HB_ERRCODE hb_fptReadBlobBlock( FPTAREAP pArea, PHB_ITEM pItem,
 }
 
 static HB_ERRCODE hb_fptReadSMTBlock( FPTAREAP pArea, PHB_ITEM pItem,
-                                      ULONG ulBlock, ULONG ulSize, BOOL fTrans )
+                                      ULONG ulBlock, ULONG ulSize, HB_BOOL fTrans )
 {
    if( ulBlock == 0 )
       return EDBF_CORRUPT;
@@ -2522,7 +2522,7 @@ static HB_ERRCODE hb_fptReadSMTBlock( FPTAREAP pArea, PHB_ITEM pItem,
  */
 static HB_ERRCODE hb_fptGetMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem,
                                  HB_FHANDLE hFile, ULONG ulBlock, ULONG ulStart,
-                                 ULONG ulCount, BOOL fTrans )
+                                 ULONG ulCount, HB_BOOL fTrans )
 {
    HB_ERRCODE errCode;
    ULONG ulSize = 0, ulType = 0;
@@ -2681,16 +2681,16 @@ static HB_ERRCODE hb_fptGetMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem,
                break;
             case FPTIT_FLEX_ARRAY:
                bMemoBuf = ( BYTE * ) pBuffer;
-               errCode = hb_fptReadFlexItem( pArea, &bMemoBuf, bMemoBuf + ulSize, pItem, TRUE, fTrans );
+               errCode = hb_fptReadFlexItem( pArea, &bMemoBuf, bMemoBuf + ulSize, pItem, HB_TRUE, fTrans );
                break;
             case FPTIT_FLEX_NIL:
                hb_itemClear( pItem );
                break;
             case FPTIT_FLEX_TRUE:
-               hb_itemPutL( pItem, TRUE );
+               hb_itemPutL( pItem, HB_TRUE );
                break;
             case FPTIT_FLEX_FALSE:
-               hb_itemPutL( pItem, FALSE );
+               hb_itemPutL( pItem, HB_FALSE );
                break;
             case FPTIT_FLEX_LDATE:
                hb_itemPutDL( pItem, ( long ) HB_GET_LE_UINT32( pBuffer ) );
@@ -2762,7 +2762,7 @@ static HB_ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize,
 {
    MEMOGCTABLE fptGCtable;
    HB_ERRCODE errCode;
-   BOOL bWrite;
+   HB_BOOL bWrite;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_fptWriteMemo(%p, %lu, %lu, %p, %p, %lu, %lu, %p)",
          pArea, ulBlock, ulSize, bBufPtr, ( void * ) ( HB_PTRDIFF ) hFile, ulType, ulLen, pulStoredBlock));
@@ -2874,7 +2874,7 @@ static HB_ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize,
                             FPT_BLOCK_OFFSET( *pulStoredBlock + ulBlocks ) - 1 );
          }
       }
-      pArea->fMemoFlush = TRUE;
+      pArea->fMemoFlush = HB_TRUE;
    }
    else
    {
@@ -2894,7 +2894,7 @@ static HB_ERRCODE hb_fptWriteMemo( FPTAREAP pArea, ULONG ulBlock, ULONG ulSize,
  * Assign a value to the specified memo field.
  */
 static HB_ERRCODE hb_fptPutMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem,
-                                 ULONG * pulBlock, BOOL fTrans )
+                                 ULONG * pulBlock, HB_BOOL fTrans )
 {
    ULONG ulBlock = 0, ulSize, ulType, ulOldSize = 0, ulOldType = 0, ulArrayCount = 0;
    BYTE itmBuffer[FLEX_ITEM_BUFSIZE];
@@ -3077,7 +3077,7 @@ static HB_ERRCODE hb_fptPutMemo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem,
 /*
  * Check if memo field has any data
  */
-static BOOL hb_fptHasMemoData( FPTAREAP pArea, USHORT uiIndex )
+static HB_BOOL hb_fptHasMemoData( FPTAREAP pArea, USHORT uiIndex )
 {
    if( --uiIndex < pArea->area.uiFieldCount )
    {
@@ -3096,7 +3096,7 @@ static BOOL hb_fptHasMemoData( FPTAREAP pArea, USHORT uiIndex )
                case HB_VF_BLOB:
                case HB_VF_BLOBCOMPRESS:
                case HB_VF_BLOBENCRYPT:
-                  return TRUE;
+                  return HB_TRUE;
                case HB_VF_DNUM:
                   return pField->uiLen <= 12;
                default:
@@ -3121,23 +3121,23 @@ static BOOL hb_fptHasMemoData( FPTAREAP pArea, USHORT uiIndex )
             do
             {
                if( *pFieldBuf >= '1' && *pFieldBuf <= '9' )
-                  return TRUE;
+                  return HB_TRUE;
                ++pFieldBuf;
             }
             while( --uiLen );
          }
       }
    }
-   return FALSE;
+   return HB_FALSE;
 }
 #endif
 
-static HB_ERRCODE hb_fptLockForRead( FPTAREAP pArea, USHORT uiIndex, BOOL *fUnLock )
+static HB_ERRCODE hb_fptLockForRead( FPTAREAP pArea, USHORT uiIndex, HB_BOOL *fUnLock )
 {
    HB_ERRCODE errCode;
-   BOOL fLocked;
+   HB_BOOL fLocked;
 
-   *fUnLock = FALSE;
+   *fUnLock = HB_FALSE;
 #ifdef HB_MEMO_SAFELOCK
    if( pArea->lpdbPendingRel )
    {
@@ -3151,7 +3151,7 @@ static HB_ERRCODE hb_fptLockForRead( FPTAREAP pArea, USHORT uiIndex, BOOL *fUnLo
        !pArea->fPositioned || !pArea->fShared ||
        pArea->fFLocked || pArea->fRecordChanged )
    {
-      fLocked = TRUE;
+      fLocked = HB_TRUE;
    }
    else
    {
@@ -3170,11 +3170,11 @@ static HB_ERRCODE hb_fptLockForRead( FPTAREAP pArea, USHORT uiIndex, BOOL *fUnLo
       if( !pArea->fValidBuffer || uiIndex == 0 ||
           hb_fptHasMemoData( pArea, uiIndex ) )
       {
-         if( !hb_fptFileLockSh( pArea, TRUE ) )
+         if( !hb_fptFileLockSh( pArea, HB_TRUE ) )
             return HB_FAILURE;
 
-         *fUnLock = TRUE;
-         pArea->fValidBuffer = FALSE;
+         *fUnLock = HB_TRUE;
+         pArea->fValidBuffer = HB_FALSE;
       }
    }
 #else
@@ -3191,7 +3191,7 @@ static HB_ERRCODE hb_fptGetVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pI
    LPFIELD pField;
    HB_ERRCODE errCode;
    BYTE * pFieldBuf;
-   BOOL fUnLock = FALSE;
+   HB_BOOL fUnLock = HB_FALSE;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_fptGetVarField(%p, %hu, %p, %p)", pArea, uiIndex, pItem, ( void * ) ( HB_PTRDIFF ) hFile));
 
@@ -3367,7 +3367,7 @@ static HB_ERRCODE hb_fptGetVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pI
    return errCode;
 }
 
-static HB_ERRCODE hb_fptGetVarFile( FPTAREAP pArea, ULONG ulBlock, const char * szFile, USHORT uiMode, BOOL fTrans )
+static HB_ERRCODE hb_fptGetVarFile( FPTAREAP pArea, ULONG ulBlock, const char * szFile, USHORT uiMode, HB_BOOL fTrans )
 {
    HB_ERRCODE errCode;
    HB_FHANDLE hFile;
@@ -3429,7 +3429,7 @@ static ULONG hb_fptPutVarFile( FPTAREAP pArea, ULONG ulBlock, const char * szFil
       else
          ulSize = ( ULONG ) HB_MIN( size, ( HB_FOFFSET ) ( 0xFFFFFFFFUL - sizeof( FPTBLOCK ) ) );
 
-      if( hb_fptFileLockEx( pArea, TRUE ) )
+      if( hb_fptFileLockEx( pArea, HB_TRUE ) )
       {
          errCode = hb_fptWriteMemo( pArea, ulBlock, 0, NULL, hFile,
                                     0, ulSize, &ulBlock );
@@ -3469,7 +3469,7 @@ static HB_ERRCODE hb_fptPutVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pI
    {
       BYTE * pFieldBuf = pArea->pRecord + pArea->pFieldOffset[ uiIndex - 1 ];
       HB_ERRCODE errCode;
-      BOOL bDeleted;
+      HB_BOOL bDeleted;
 
       /* update any pending relations and reread record if necessary */
       errCode = SELF_DELETED( ( AREAP ) pArea, &bDeleted );
@@ -3489,7 +3489,7 @@ static HB_ERRCODE hb_fptPutVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pI
 
       if( pField->uiType != HB_FT_ANY )
       {
-         if( !hb_fptFileLockEx( pArea, TRUE ) )
+         if( !hb_fptFileLockEx( pArea, HB_TRUE ) )
             return EDBF_LOCK;
          errCode = hb_fptPutMemo( pArea, uiIndex, pItem, NULL,
                                   ( pField->uiFlags & HB_FF_BINARY ) == 0 &&
@@ -3640,7 +3640,7 @@ static HB_ERRCODE hb_fptPutVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pI
          else if( HB_IS_ARRAY( pItem ) )
          {
             ULONG ulArrayCount = 0;
-            BOOL fTrans = ( pField->uiFlags & HB_FF_BINARY ) == 0 &&
+            HB_BOOL fTrans = ( pField->uiFlags & HB_FF_BINARY ) == 0 &&
                           hb_vmCDP() != pArea->area.cdPage;
             ulNewSize = hb_fptCountSMTItemLength( pArea, pItem, &ulArrayCount, fTrans );
             pBlock = pAlloc = ( BYTE * ) hb_xgrab( ulNewSize );
@@ -3658,7 +3658,7 @@ static HB_ERRCODE hb_fptPutVarField( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pI
             HB_PUT_LE_UINT32( pFieldBuf + pField->uiLen - 6, 0 );
          if( ulOldBlock != 0 || ulNewSize != 0 )
          {
-            if( !hb_fptFileLockEx( pArea, TRUE ) )
+            if( !hb_fptFileLockEx( pArea, HB_TRUE ) )
             {
                errCode = EDBF_LOCK;
             }
@@ -3725,7 +3725,7 @@ static HB_ERRCODE hb_fptGetVarLen( FPTAREAP pArea, USHORT uiIndex, ULONG * pLeng
          pArea->area.lpFields[ uiIndex - 1 ].uiType == HB_FT_OLE ) )
    {
       HB_ERRCODE errCode;
-      BOOL fUnLock;
+      HB_BOOL fUnLock;
 
       errCode = hb_fptLockForRead( pArea, uiIndex, &fUnLock );
       if( errCode == HB_SUCCESS )
@@ -3807,7 +3807,7 @@ static HB_ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo
       char szFileName[ HB_PATH_MAX ];
       PHB_FNAME pFileName;
       PHB_ITEM pError = NULL, pItem = NULL;
-      BOOL bRetry;
+      HB_BOOL bRetry;
 
       if( !pArea->bMemoType )
       {
@@ -3911,7 +3911,7 @@ static HB_ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo
             bRetry = ( SELF_ERROR( ( AREAP ) pArea, pError ) == E_RETRY );
          }
          else
-            bRetry = FALSE;
+            bRetry = HB_FALSE;
       } while( bRetry );
 
       if( pError )
@@ -3974,7 +3974,7 @@ static HB_ERRCODE hb_fptCreateMemFile( FPTAREAP pArea, LPDBOPENINFO pCreateInfo
    }
    /* trunc file */
    hb_fileTruncAt( pArea->pMemoFile, ulSize );
-   pArea->fMemoFlush = TRUE;
+   pArea->fMemoFlush = HB_TRUE;
    return HB_SUCCESS;
 }
 
@@ -4044,7 +4044,7 @@ static HB_ERRCODE hb_fptOpenMemFile( FPTAREAP pArea, LPDBOPENINFO pOpenInfo )
    PHB_FNAME pFileName;
    PHB_ITEM pError;
    USHORT uiFlags;
-   BOOL bRetry;
+   HB_BOOL bRetry;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_fptOpenMemFile(%p, %p)", pArea, pOpenInfo));
 
@@ -4103,7 +4103,7 @@ static HB_ERRCODE hb_fptOpenMemFile( FPTAREAP pArea, LPDBOPENINFO pOpenInfo )
          bRetry = ( SELF_ERROR( ( AREAP ) pArea, pError ) == E_RETRY );
       }
       else
-         bRetry = FALSE;
+         bRetry = HB_FALSE;
    } while( bRetry );
 
    if( pError )
@@ -4122,7 +4122,7 @@ static HB_ERRCODE hb_fptOpenMemFile( FPTAREAP pArea, LPDBOPENINFO pOpenInfo )
    {
       FPTHEADER fptHeader;
       memset( &fptHeader, 0, sizeof( FPTHEADER ) );
-      if( hb_fptFileLockSh( pArea, TRUE ) )
+      if( hb_fptFileLockSh( pArea, HB_TRUE ) )
       {
          if( hb_fileReadAt( pArea->pMemoFile, &fptHeader,
                             sizeof( FPTHEADER ), 0 ) >= 512 )
@@ -4198,7 +4198,7 @@ static HB_ERRCODE hb_fptPutValueFile( FPTAREAP pArea, USHORT uiIndex, const char
          ( pField->uiType == HB_FT_ANY && pField->uiLen >= 6 ) ) )
    {
       HB_ERRCODE errCode;
-      BOOL bDeleted;
+      HB_BOOL bDeleted;
       HB_FHANDLE hFile;
 
       /* update any pending relations and reread record if necessary */
@@ -4245,7 +4245,7 @@ static HB_ERRCODE hb_fptPutValueFile( FPTAREAP pArea, USHORT uiIndex, const char
             hb_itemRelease( pItem );
          }
       }
-      else if( !hb_fptFileLockEx( pArea, TRUE ) )
+      else if( !hb_fptFileLockEx( pArea, HB_TRUE ) )
       {
          hb_fsClose( hFile );
          errCode = EDBF_LOCK;
@@ -4466,13 +4466,13 @@ static HB_ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize,
                if( pEvalBlock )
                {
                   SELF_GOTO( ( AREAP ) pArea, 0 );
-                  pArea->area.fEof = FALSE;
+                  pArea->area.fEof = HB_FALSE;
                   hb_vmEvalBlock( pEvalBlock );
                }
 
                for( ulRecNo = 1; ulRecNo <= ulRecords; ++ulRecNo )
                {
-                  BOOL fDeleted;
+                  HB_BOOL fDeleted;
 
                   errCode = SELF_GOTO( ( AREAP ) pArea, ulRecNo );
                   if( errCode != HB_SUCCESS )
@@ -4501,7 +4501,7 @@ static HB_ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize,
                if( errCode == HB_SUCCESS && pEvalBlock )
                {
                   SELF_GOTO( ( AREAP ) pArea, 0 );
-                  pArea->area.fBof = FALSE;
+                  pArea->area.fBof = HB_FALSE;
                   hb_vmEvalBlock( pEvalBlock );
                }
             }
@@ -4549,7 +4549,7 @@ static HB_ERRCODE hb_fptDoPack( FPTAREAP pArea, USHORT uiBlockSize,
  * Pack helper function called for each packed record
  * ( DBENTRYP_LSP )   hb_fptPackRec,
  */
-static HB_ERRCODE hb_fptPackRec( FPTAREAP pArea, ULONG ulRecNo, BOOL *pfWritten )
+static HB_ERRCODE hb_fptPackRec( FPTAREAP pArea, ULONG ulRecNo, HB_BOOL *pfWritten )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_fptPackRec(%p, %lu, %p)", pArea, ulRecNo, pfWritten));
 
@@ -4601,9 +4601,9 @@ static HB_ERRCODE hb_fptPack( FPTAREAP pArea )
 
          if( errCode == HB_SUCCESS )
          {
-            pArea->fPackMemo = TRUE;
+            pArea->fPackMemo = HB_TRUE;
             errCode = SUPER_PACK( ( AREAP ) pArea );
-            pArea->fPackMemo = FALSE;
+            pArea->fPackMemo = HB_FALSE;
             if( errCode == HB_SUCCESS )
             {
                HB_FOFFSET size = hb_fileSize( pArea->pMemoTmpFile );
@@ -4790,7 +4790,7 @@ static HB_ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
             ulBlock = hb_arrayGetNL( pItem, 1 );
             if( pValue )
             {
-               if( hb_fptFileLockEx( pArea, TRUE ) )
+               if( hb_fptFileLockEx( pArea, HB_TRUE ) )
                {
                   errCode = hb_fptPutMemo( pArea, 0, pValue, &ulBlock, FPT_DIRECT_TRANS( pArea ) );
                   hb_fptFileUnLock( pArea );
@@ -4835,7 +4835,7 @@ static HB_ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
          errCode = hb_fptGetRootBlock( pArea, &ulBlock );
          if( errCode == HB_SUCCESS )
          {
-            if( hb_fptFileLockEx( pArea, TRUE ) )
+            if( hb_fptFileLockEx( pArea, HB_TRUE ) )
             {
                errCode = hb_fptPutMemo( pArea, 0, pItem, &ulBlock, FPT_DIRECT_TRANS( pArea ) );
                hb_fptFileUnLock( pArea );
@@ -4849,10 +4849,10 @@ static HB_ERRCODE hb_fptInfo( FPTAREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
          {
             if( errCode != HB_FAILURE )
                hb_memoErrorRT( pArea, 0, errCode, pArea->szMemoFileName, 0, 0 );
-            hb_itemPutL( pItem, FALSE );
+            hb_itemPutL( pItem, HB_FALSE );
             return HB_FAILURE;
          }
-         hb_itemPutL( pItem, TRUE );
+         hb_itemPutL( pItem, HB_TRUE );
          break;
       }
       case DBI_BLOB_ROOT_LOCK:      /* BLOBRootLock() */
@@ -4896,7 +4896,7 @@ static HB_ERRCODE hb_fptFieldInfo( FPTAREAP pArea, USHORT uiIndex, USHORT uiType
          pArea->area.lpFields[ uiIndex - 1 ].uiType == HB_FT_OLE ) )
    {
       ULONG ulBlock, ulSize, ulType;
-      BOOL bDeleted;
+      HB_BOOL bDeleted;
 
       SELF_DELETED( ( AREAP ) pArea, &bDeleted );
       switch( uiType )
@@ -4906,7 +4906,7 @@ static HB_ERRCODE hb_fptFieldInfo( FPTAREAP pArea, USHORT uiIndex, USHORT uiType
             /* pItem := { <nStart>, <nCount> } */
             ULONG ulStart, ulCount;
             HB_ERRCODE errCode;
-            BOOL fTrans = FPT_DIRECT_TRANS( pArea );
+            HB_BOOL fTrans = FPT_DIRECT_TRANS( pArea );
 
             if( HB_IS_ARRAY( pItem ) )
             {
@@ -4920,7 +4920,7 @@ static HB_ERRCODE hb_fptFieldInfo( FPTAREAP pArea, USHORT uiIndex, USHORT uiType
                ulStart = ulCount = 0;
             }
             if( ulStart || ulCount )
-               fTrans = FALSE;
+               fTrans = HB_FALSE;
             errCode = hb_fptGetMemo( pArea, uiIndex, pItem, FS_ERROR, 0, ulStart, ulCount, fTrans );
             if( errCode != HB_SUCCESS )
             {
@@ -5056,11 +5056,11 @@ static HB_ERRCODE hb_fptRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect
 #if defined( HB_MEMO_SAFELOCK )
          hb_itemPutL( pItem, pRDD->rddID != s_uiRddIdBLOB );
 #else
-         hb_itemPutL( pItem, FALSE );
+         hb_itemPutL( pItem, HB_FALSE );
 #endif
          break;
       case RDDI_MEMOREUSE:
-         hb_itemPutL( pItem, TRUE );
+         hb_itemPutL( pItem, HB_TRUE );
          break;
 
       case RDDI_BLOB_SUPPORT:

harbour/src/rdd/dbsql.c

@@ -131,8 +131,8 @@ static PHB_FILEBUF hb_createFBuffer( HB_FHANDLE hFile, ULONG ulSize )
 
 
 /* Export field value into the buffer in SQL format */
-static BOOL hb_exportBufSqlVar( PHB_FILEBUF pFileBuf, PHB_ITEM pValue,
-                                const char * szDelim, const char * szEsc )
+static HB_BOOL hb_exportBufSqlVar( PHB_FILEBUF pFileBuf, PHB_ITEM pValue,
+                                   const char * szDelim, const char * szEsc )
 {
    switch( hb_itemType( pValue ) )
    {
@@ -228,9 +228,9 @@ static BOOL hb_exportBufSqlVar( PHB_FILEBUF pFileBuf, PHB_ITEM pValue,
       /* an "M" field or the other, might be a "V" in SixDriver */
       default:
          /* We do not want MEMO contents */
-         return FALSE;
+         return HB_FALSE;
    }
-   return TRUE;
+   return HB_TRUE;
 }
 
 /* Export DBF content to a SQL script file */
@@ -238,17 +238,17 @@ static ULONG hb_db2Sql( AREAP pArea, PHB_ITEM pFields, HB_LONG llNext,
                         PHB_ITEM pWhile, PHB_ITEM pFor,
                         const char * szDelim, const char * szSep,
                         const char * szEsc, const char * szTable,
-                        HB_FHANDLE hFile, BOOL fInsert, BOOL fRecno )
+                        HB_FHANDLE hFile, HB_BOOL fInsert, HB_BOOL fRecno )
 {
    PHB_FILEBUF pFileBuf;
    ULONG ulRecords = 0;
    USHORT uiFields = 0, ui;
    PHB_ITEM pTmp;
-   BOOL fWriteSep = FALSE;
+   HB_BOOL fWriteSep = HB_FALSE;
    const char * szNewLine = hb_conNewLine();
    char * szInsert = NULL;
-   BOOL fEof = TRUE;
-   BOOL fNoFieldPassed = ( pFields == NULL || hb_arrayLen( pFields ) == 0 );
+   HB_BOOL fEof = HB_TRUE;
+   HB_BOOL fNoFieldPassed = ( pFields == NULL || hb_arrayLen( pFields ) == 0 );
 
    if( SELF_FIELDCOUNT( pArea, &uiFields ) != HB_SUCCESS )
       return 0;
@@ -321,7 +321,7 @@ static ULONG hb_db2Sql( AREAP pArea, PHB_ITEM pFields, HB_LONG llNext,
          if( szInsert )
             hb_addStrToFBuffer( pFileBuf, " );" );
          hb_addStrToFBuffer( pFileBuf, szNewLine );
-         fWriteSep = FALSE;
+         fWriteSep = HB_FALSE;
       }
 
       if( SELF_SKIP( pArea, 1 ) != HB_SUCCESS )
@@ -347,7 +347,7 @@ HB_FUNC( __DBSQL )
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
    if( pArea )
    {
-      BOOL fExport            = hb_parl( 1 );
+      HB_BOOL fExport         = hb_parl( 1 );
       const char * szFileName = hb_parc( 2 );
       const char * szTable    = hb_parc( 3 );
       PHB_ITEM pFields        = hb_param( 4, HB_IT_ARRAY );
@@ -355,10 +355,10 @@ HB_FUNC( __DBSQL )
       PHB_ITEM pWhile         = hb_param( 6, HB_IT_BLOCK );
       PHB_ITEM pNext          = hb_param( 7, HB_IT_NUMERIC );
       PHB_ITEM pRecord        = HB_ISNIL( 8 ) ? NULL : hb_param( 8, HB_IT_ANY );
-      BOOL fRest              = pWhile != NULL || hb_parl( 9 );
-      BOOL fAppend            = hb_parl( 10 );
-      BOOL fInsert            = hb_parl( 11 );
-      BOOL fRecno             = hb_parl( 12 );
+      HB_BOOL fRest           = pWhile != NULL || hb_parl( 9 );
+      HB_BOOL fAppend         = hb_parl( 10 );
+      HB_BOOL fInsert         = hb_parl( 11 );
+      HB_BOOL fRecno          = hb_parl( 12 );
       const char * szSep      = hb_parcx( 13 );
       const char * szDelim    = hb_parcx( 14 );
       const char * szEsc      = hb_parcx( 15 );
@@ -371,7 +371,7 @@ HB_FUNC( __DBSQL )
       else if( fExport )   /* COPY TO SQL */
       {
          PHB_ITEM pError = NULL;
-         BOOL fRetry;
+         HB_BOOL fRetry;
 
          /* Try to create Dat file */
          do
@@ -407,7 +407,7 @@ HB_FUNC( __DBSQL )
                fRetry = hb_errLaunch( pError ) == E_RETRY;
             }
             else
-               fRetry = FALSE;
+               fRetry = HB_FALSE;
          }
          while( fRetry );
 

harbour/src/rdd/delim1.c

@@ -323,7 +323,7 @@ static HB_ERRCODE hb_delimReadRecord( DELIMAREAP pArea )
             {
                HB_LONG lVal;
                double dVal;
-               BOOL fDbl;
+               HB_BOOL fDbl;
 
                fDbl = hb_strnToNum( (const char *) buffer, uiSize, &lVal, &dVal );
                if( fDbl )
@@ -357,13 +357,13 @@ static HB_ERRCODE hb_delimReadRecord( DELIMAREAP pArea )
        pArea->ulRecordOffset == ( HB_FOFFSET ) ( pArea->ulBufferStart +
                                                  pArea->ulBufferIndex ) )
    {
-      pArea->area.fEof = TRUE;
-      pArea->fPositioned = FALSE;
+      pArea->area.fEof = HB_TRUE;
+      pArea->fPositioned = HB_FALSE;
    }
    else
    {
-      pArea->area.fEof = FALSE;
-      pArea->fPositioned = TRUE;
+      pArea->area.fEof = HB_FALSE;
+      pArea->fPositioned = HB_TRUE;
    }
 
    return HB_SUCCESS;
@@ -377,8 +377,8 @@ static HB_ERRCODE hb_delimNextRecord( DELIMAREAP pArea )
    {
       if( pArea->ulNextOffset == ( HB_FOFFSET ) -1 )
       {
-         pArea->area.fEof = TRUE;
-         pArea->fPositioned = FALSE;
+         pArea->area.fEof = HB_TRUE;
+         pArea->fPositioned = HB_FALSE;
          hb_delimClearRecordBuffer( pArea );
       }
       else
@@ -405,8 +405,8 @@ static HB_ERRCODE hb_delimGoTop( DELIMAREAP pArea )
    if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS )
       return HB_FAILURE;
 
-   pArea->area.fTop = TRUE;
-   pArea->area.fBottom = FALSE;
+   pArea->area.fTop = HB_TRUE;
+   pArea->area.fBottom = HB_FALSE;
 
    pArea->ulRecordOffset = 0;
    pArea->ulRecNo = 1;
@@ -435,13 +435,13 @@ static HB_ERRCODE hb_delimSkipRaw( DELIMAREAP pArea, LONG lToSkip )
 /*
  * Determine deleted status for a record.
  */
-static HB_ERRCODE hb_delimDeleted( DELIMAREAP pArea, BOOL * pDeleted )
+static HB_ERRCODE hb_delimDeleted( DELIMAREAP pArea, HB_BOOL * pDeleted )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_delimDeleted(%p,%p)", pArea, pDeleted));
 
    HB_SYMBOL_UNUSED( pArea );
 
-   * pDeleted = FALSE;
+   * pDeleted = HB_FALSE;
 
    return HB_SUCCESS;
 }
@@ -502,7 +502,7 @@ static HB_ERRCODE hb_delimRecId( DELIMAREAP pArea, PHB_ITEM pRecNo )
 /*
  * Append a record to the WorkArea.
  */
-static HB_ERRCODE hb_delimAppend( DELIMAREAP pArea, BOOL fUnLockAll )
+static HB_ERRCODE hb_delimAppend( DELIMAREAP pArea, HB_BOOL fUnLockAll )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_delimAppend(%p,%d)", pArea, (int) fUnLockAll));
 
@@ -516,8 +516,8 @@ static HB_ERRCODE hb_delimAppend( DELIMAREAP pArea, BOOL fUnLockAll )
 
    pArea->ulRecordOffset = pArea->ulFileSize;
    pArea->ulRecNo = ++pArea->ulRecCount;
-   pArea->area.fEof = FALSE;
-   pArea->fPositioned = TRUE;
+   pArea->area.fEof = HB_FALSE;
+   pArea->fPositioned = HB_TRUE;
    hb_delimClearRecordBuffer( pArea );
 
    return HB_SUCCESS;
@@ -533,8 +533,8 @@ static HB_ERRCODE hb_delimDeleteRec( DELIMAREAP pArea )
    if( pArea->fRecordChanged )
    {
       pArea->ulRecCount--;
-      pArea->area.fEof = TRUE;
-      pArea->fPositioned = pArea->fRecordChanged = FALSE;
+      pArea->area.fEof = HB_TRUE;
+      pArea->fPositioned = pArea->fRecordChanged = HB_FALSE;
       hb_delimClearRecordBuffer( pArea );
    }
 
@@ -576,10 +576,10 @@ static HB_ERRCODE hb_delimGetValue( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM p
             case 't':
             case 'Y':
             case 'y':
-               hb_itemPutL( pItem, TRUE );
+               hb_itemPutL( pItem, HB_TRUE );
                break;
             default:
-               hb_itemPutL( pItem, FALSE );
+               hb_itemPutL( pItem, HB_FALSE );
                break;
          }
          break;
@@ -592,7 +592,7 @@ static HB_ERRCODE hb_delimGetValue( DELIMAREAP pArea, USHORT uiIndex, PHB_ITEM p
       {
          HB_LONG lVal;
          double dVal;
-         BOOL fDbl;
+         HB_BOOL fDbl;
 
          fDbl = hb_strnToNum( (const char *) pArea->pRecord + pArea->pFieldOffset[ uiIndex ],
                               pField->uiLen, &lVal, &dVal );
@@ -797,7 +797,7 @@ static HB_ERRCODE hb_delimTrans( DELIMAREAP pArea, LPDBTRANSINFO pTransInfo )
          pTransInfo->uiFlags |= DBTF_PUTREC;
       else
       {
-         PHB_ITEM pPutRec = hb_itemPutL( NULL, FALSE );
+         PHB_ITEM pPutRec = hb_itemPutL( NULL, HB_FALSE );
          if( SELF_INFO( ( AREAP ) pTransInfo->lpaDest, DBI_CANPUTREC, pPutRec ) != HB_SUCCESS )
          {
             hb_itemRelease( pPutRec );
@@ -840,8 +840,8 @@ static HB_ERRCODE hb_delimGoCold( DELIMAREAP pArea )
       }
       pArea->ulFileSize += ulSize;
       pArea->ulNextOffset = pArea->ulFileSize;
-      pArea->fRecordChanged = FALSE;
-      pArea->fFlush = TRUE;
+      pArea->fRecordChanged = HB_FALSE;
+      pArea->fFlush = HB_TRUE;
    }
    return HB_SUCCESS;
 }
@@ -865,7 +865,7 @@ static HB_ERRCODE hb_delimGoHot( DELIMAREAP pArea )
       hb_itemRelease( pError );
       return HB_FAILURE;
    }
-   pArea->fRecordChanged = TRUE;
+   pArea->fRecordChanged = HB_TRUE;
    return HB_SUCCESS;
 }
 
@@ -886,7 +886,7 @@ static HB_ERRCODE hb_delimFlush( DELIMAREAP pArea )
       if( hb_setGetHardCommit() )
       {
          hb_fileCommit( pArea->pFile );
-         pArea->fFlush = FALSE;
+         pArea->fFlush = HB_FALSE;
       }
    }
 
@@ -1043,7 +1043,7 @@ static HB_ERRCODE hb_delimAddField( DELIMAREAP pArea, LPDBFIELDINFO pFieldInfo )
       case HB_FT_OLE:
          pFieldInfo->uiType = HB_FT_MEMO;
          pFieldInfo->uiLen = 0;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       case HB_FT_ANY:
@@ -1062,14 +1062,14 @@ static HB_ERRCODE hb_delimAddField( DELIMAREAP pArea, LPDBFIELDINFO pFieldInfo )
             pFieldInfo->uiType = HB_FT_MEMO;
             pFieldInfo->uiLen = 0;
          }
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       case HB_FT_DATE:
          if( pFieldInfo->uiLen != 8 )
          {
             pFieldInfo->uiLen = 8;
-            pArea->fTransRec = FALSE;
+            pArea->fTransRec = HB_FALSE;
          }
          break;
 
@@ -1085,19 +1085,19 @@ static HB_ERRCODE hb_delimAddField( DELIMAREAP pArea, LPDBFIELDINFO pFieldInfo )
          pFieldInfo->uiLen = s_uiNumLength[ pFieldInfo->uiLen ];
          if( pFieldInfo->uiDec )
             pFieldInfo->uiLen++;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       case HB_FT_DOUBLE:
       case HB_FT_CURDOUBLE:
          pFieldInfo->uiType = HB_FT_LONG;
          pFieldInfo->uiLen = 20;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       case HB_FT_VARLENGTH:
          pFieldInfo->uiType = HB_FT_STRING;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          uiDelim = 2;
          break;
 
@@ -1105,7 +1105,7 @@ static HB_ERRCODE hb_delimAddField( DELIMAREAP pArea, LPDBFIELDINFO pFieldInfo )
          if( pFieldInfo->uiLen != 1 )
          {
             pFieldInfo->uiLen = 1;
-            pArea->fTransRec = FALSE;
+            pArea->fTransRec = HB_FALSE;
          }
          break;
 
@@ -1115,20 +1115,20 @@ static HB_ERRCODE hb_delimAddField( DELIMAREAP pArea, LPDBFIELDINFO pFieldInfo )
       case HB_FT_TIME:
          pFieldInfo->uiType = HB_FT_STRING;
          pFieldInfo->uiLen = 12;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       case HB_FT_TIMESTAMP:
       case HB_FT_MODTIME:
          pFieldInfo->uiType = HB_FT_STRING;
          pFieldInfo->uiLen = 23;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       default:
          pFieldInfo->uiType = HB_FT_NONE;
          pFieldInfo->uiLen = 0;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
    }
 
@@ -1171,7 +1171,7 @@ static HB_ERRCODE hb_delimNewArea( DELIMAREAP pArea )
       return HB_FAILURE;
 
    pArea->pFile = NULL;
-   pArea->fTransRec = TRUE;
+   pArea->fTransRec = HB_TRUE;
    pArea->uiRecordLen = 0;
    pArea->ulBufferSize = 0;
 
@@ -1250,13 +1250,13 @@ static HB_ERRCODE hb_delimCreate( DELIMAREAP pArea, LPDBOPENINFO pCreateInfo )
    PHB_ITEM pError = NULL;
    PHB_FNAME pFileName;
    HB_ERRCODE errCode;
-   BOOL fRetry;
+   HB_BOOL fRetry;
    char szFileName[ HB_PATH_MAX ];
 
    HB_TRACE(HB_TR_DEBUG, ("hb_delimCreate(%p,%p)", pArea, pCreateInfo));
 
-   pArea->fShared = FALSE;    /* pCreateInfo->fShared; */
-   pArea->fReadonly = FALSE;  /* pCreateInfo->fReadonly */
+   pArea->fShared = HB_FALSE;    /* pCreateInfo->fShared; */
+   pArea->fReadonly = HB_FALSE;  /* pCreateInfo->fReadonly */
 
    if( pCreateInfo->cdpId )
    {
@@ -1304,7 +1304,7 @@ static HB_ERRCODE hb_delimCreate( DELIMAREAP pArea, LPDBOPENINFO pCreateInfo )
          fRetry = ( SELF_ERROR( ( AREAP ) pArea, pError ) == E_RETRY );
       }
       else
-         fRetry = FALSE;
+         fRetry = HB_FALSE;
    }
    while( fRetry );
 
@@ -1336,14 +1336,14 @@ static HB_ERRCODE hb_delimOpen( DELIMAREAP pArea, LPDBOPENINFO pOpenInfo )
    PHB_FNAME pFileName;
    HB_ERRCODE errCode;
    USHORT uiFlags;
-   BOOL fRetry;
+   HB_BOOL fRetry;
    char szFileName[ HB_PATH_MAX ];
    char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ];
 
    HB_TRACE(HB_TR_DEBUG, ("hb_delimOpen(%p,%p)", pArea, pOpenInfo));
 
-   pArea->fShared = TRUE;     /* pOpenInfo->fShared; */
-   pArea->fReadonly = TRUE;   /* pOpenInfo->fReadonly; */
+   pArea->fShared = HB_TRUE;     /* pOpenInfo->fShared; */
+   pArea->fReadonly = HB_TRUE;   /* pOpenInfo->fReadonly; */
 
    if( pOpenInfo->cdpId )
    {
@@ -1406,7 +1406,7 @@ static HB_ERRCODE hb_delimOpen( DELIMAREAP pArea, LPDBOPENINFO pOpenInfo )
          fRetry = ( SELF_ERROR( ( AREAP ) pArea, pError ) == E_RETRY );
       }
       else
-         fRetry = FALSE;
+         fRetry = HB_FALSE;
    }
    while( fRetry );
 
@@ -1440,7 +1440,7 @@ static HB_ERRCODE hb_delimRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConne
    {
       case RDDI_CANPUTREC:
       case RDDI_LOCAL:
-         hb_itemPutL( pItem, TRUE );
+         hb_itemPutL( pItem, HB_TRUE );
          break;
 
       case RDDI_TABLEEXT:

harbour/src/rdd/hbdbsort.c

@@ -52,12 +52,12 @@
 
 #include "hbdbsort.h"
 
-BOOL hb_dbQSortInit( LPDBQUICKSORT pQuickSort, LPDBSORTINFO pSortInfo, USHORT uiRecordLen )
+HB_BOOL hb_dbQSortInit( LPDBQUICKSORT pQuickSort, LPDBSORTINFO pSortInfo, USHORT uiRecordLen )
 {
    /* Create temp file */
    pQuickSort->hFile = hb_fsCreateTemp( NULL, NULL, FC_NORMAL, pQuickSort->szTempName );
    if( pQuickSort->hFile == FS_ERROR )
-      return FALSE;
+      return HB_FALSE;
 
    /* Alloc buffers */
    pQuickSort->uiMaxRecords = USHRT_MAX / uiRecordLen;
@@ -70,7 +70,7 @@ BOOL hb_dbQSortInit( LPDBQUICKSORT pQuickSort, LPDBSORTINFO pSortInfo, USHORT ui
    /* Fill structure */
    pQuickSort->uiRecordLen = uiRecordLen;
    pQuickSort->pSortInfo = pSortInfo;
-   return TRUE;
+   return HB_TRUE;
 }
 
 void hb_dbQSortExit( LPDBQUICKSORT pQuickSort )
@@ -87,7 +87,7 @@ void hb_dbQSortExit( LPDBQUICKSORT pQuickSort )
    hb_xfree( pQuickSort->pCmpBufferB );
 }
 
-BOOL hb_dbQSortAdvance( LPDBQUICKSORT pQuickSort, USHORT uiCount )
+HB_BOOL hb_dbQSortAdvance( LPDBQUICKSORT pQuickSort, USHORT uiCount )
 {
    USHORT uiSize;
 
@@ -96,12 +96,12 @@ BOOL hb_dbQSortAdvance( LPDBQUICKSORT pQuickSort, USHORT uiCount )
    return ( hb_fsWrite( pQuickSort->hFile, pQuickSort->pBuffer, uiSize ) == uiSize );
 }
 
-static BOOL hb_dbQSortIsLess( LPDBQUICKSORT pQuickSort, ULONG ulRecNo1, ULONG ulRecNo2 )
+static HB_BOOL hb_dbQSortIsLess( LPDBQUICKSORT pQuickSort, ULONG ulRecNo1, ULONG ulRecNo2 )
 {
    USHORT uiCount, uiField;
    DBFAREAP pArea;
    LPFIELD pField;
-   BOOL bAscending, bIgnoreCase;
+   HB_BOOL bAscending, bIgnoreCase;
    int iResult;
 
    pArea = ( DBFAREAP ) pQuickSort->pSortInfo->dbtri.lpaSource;
@@ -165,7 +165,7 @@ static BOOL hb_dbQSortIsLess( LPDBQUICKSORT pQuickSort, ULONG ulRecNo1, ULONG ul
       else
          return ( iResult > 0 );
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static void hb_dbQSortSwap( LPDBQUICKSORT pQuickSort, ULONG ulRecNo1, ULONG ulRecNo2 )
@@ -246,7 +246,7 @@ void hb_dbQSortComplete( LPDBQUICKSORT pQuickSort )
          }
 
          /* Append a new record and copy data */
-         if( SELF_APPEND( pArea, TRUE ) == HB_FAILURE ||
+         if( SELF_APPEND( pArea, HB_TRUE ) == HB_FAILURE ||
              SELF_PUTREC( pArea, pQuickSort->pSwapBufferA ) == HB_FAILURE )
             break;
       }

harbour/src/rdd/hbsix/sxcompr.c

@@ -235,8 +235,8 @@ static PHB_LZSSX_COMPR hb_LZSSxInit(
 
    pCompr->ulMaxSize   = 0;
    pCompr->ulOutSize   = 0;
-   pCompr->fResult     = TRUE;
-   pCompr->fContinue   = FALSE;
+   pCompr->fResult     = HB_TRUE;
+   pCompr->fContinue   = HB_FALSE;
 
    if( pCompr->fInFree )
       pCompr->inBuffer    = ( BYTE * ) hb_xgrab( ulDstBuf );
@@ -258,7 +258,7 @@ static HB_BOOL hb_LZSSxFlush( PHB_LZSSX_COMPR pCompr )
       if( hb_fsWriteLarge( pCompr->hOutput, pCompr->outBuffer,
                            pCompr->outBuffPos ) != pCompr->outBuffPos )
       {
-         pCompr->fResult = FALSE;
+         pCompr->fResult = HB_FALSE;
       }
       else
       {
@@ -278,7 +278,7 @@ static HB_BOOL hb_LZSSxWrite( PHB_LZSSX_COMPR pCompr, UCHAR ucVal )
       if( pCompr->outBuffPos < pCompr->outBuffSize )
          pCompr->outBuffer[ pCompr->outBuffPos ] = ucVal;
       else
-         pCompr->fResult = FALSE;
+         pCompr->fResult = HB_FALSE;
    }
    pCompr->outBuffPos++;
    return pCompr->fResult || pCompr->fContinue;
@@ -302,7 +302,7 @@ static int hb_LZSSxRead( PHB_LZSSX_COMPR pCompr )
 
 static HB_BOOL hb_LZSSxDecode( PHB_LZSSX_COMPR pCompr )
 {
-   HB_BOOL fResult = TRUE;
+   HB_BOOL fResult = HB_TRUE;
    USHORT itemMask;
    int offset, length, index, c, h;
 
@@ -327,7 +327,7 @@ static HB_BOOL hb_LZSSxDecode( PHB_LZSSX_COMPR pCompr )
       {
          if( ! hb_LZSSxWrite( pCompr, ( UCHAR ) c ) )
          {
-            fResult = FALSE;
+            fResult = HB_FALSE;
             break;
          }
          pCompr->ring_buffer[ index ] = ( UCHAR ) c;
@@ -337,7 +337,7 @@ static HB_BOOL hb_LZSSxDecode( PHB_LZSSX_COMPR pCompr )
       {
          if( ( h = hb_LZSSxRead( pCompr ) ) == -1 )
          {
-            /* fResult = FALSE; */
+            /* fResult = HB_FALSE; */
             break;
          }
          offset = LZSS_OFFSET( c, h );   /* get offset to ring buffer */
@@ -347,7 +347,7 @@ static HB_BOOL hb_LZSSxDecode( PHB_LZSSX_COMPR pCompr )
             c = pCompr->ring_buffer[ RBUFINDEX( offset + h ) ];
             if( ! hb_LZSSxWrite( pCompr, ( UCHAR ) c ) )
             {
-               fResult = FALSE;
+               fResult = HB_FALSE;
                break;
             }
             /* SIX does not use additional buffers and dynamically
@@ -615,7 +615,7 @@ HB_BOOL hb_LZSSxDecompressFile( HB_FHANDLE hInput, HB_FHANDLE hOutput )
 
 HB_FUNC( SX_FCOMPRESS )
 {
-   HB_BOOL fRet = FALSE;
+   HB_BOOL fRet = HB_FALSE;
    HB_FHANDLE hInput, hOutput;
    const char * szSource = hb_parc( 1 ), * szDestin = hb_parc( 2 );
    BYTE buf[ 4 ];
@@ -652,7 +652,7 @@ HB_FUNC( SX_FCOMPRESS )
 
 HB_FUNC( SX_FDECOMPRESS )
 {
-   HB_BOOL fRet = FALSE;
+   HB_BOOL fRet = HB_FALSE;
    HB_FHANDLE hInput, hOutput;
    const char * szSource = hb_parc( 1 ), * szDestin = hb_parc( 2 );
 
@@ -707,7 +707,7 @@ HB_FUNC( _SX_STRCOMPRESS )
 
 HB_FUNC( _SX_STRDECOMPRESS )
 {
-   HB_BOOL fOK = FALSE;
+   HB_BOOL fOK = HB_FALSE;
    const char * pStr = hb_parc( 1 );
    char * pBuf;
 
@@ -721,7 +721,7 @@ HB_FUNC( _SX_STRDECOMPRESS )
          if( ulBuf == HB_SX_UNCOMPRESED )
          {
             hb_retclen( pStr + 4, ulLen - 4 );
-            fOK = TRUE;
+            fOK = HB_TRUE;
          }
          else
          {

harbour/src/rdd/hbsix/sxcrypt.c

@@ -133,9 +133,9 @@ void hb_sxDeCrypt( const char * pSrc, char * pDst, const char * pKeyVal, HB_SIZE
    }
 }
 
-static BOOL _hb_sxGetKey( PHB_ITEM pKeyItem, char * pKeyVal )
+static HB_BOOL _hb_sxGetKey( PHB_ITEM pKeyItem, char * pKeyVal )
 {
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
    PHB_ITEM pItem = NULL;
    ULONG ulKey;
 
@@ -157,7 +157,7 @@ static BOOL _hb_sxGetKey( PHB_ITEM pKeyItem, char * pKeyVal )
          memcpy( pKeyVal, hb_itemGetCPtr( pKeyItem ), HB_MIN( ulKey, 8 ) );
       if( ulKey < 8 )
          memset( pKeyVal + ulKey, 0, 8 - ulKey );
-      fResult = TRUE;
+      fResult = HB_TRUE;
    }
    if( pItem )
       hb_itemRelease( pItem );

harbour/src/rdd/hbsix/sxfname.c

@@ -81,14 +81,14 @@ HB_FUNC( SX_FNAMEPARSER )
          if( pFileName->szName )
          {
             ulLen = strlen( pFileName->szName );
-            ulLen = hb_strRTrimLen( pFileName->szName, ulLen, FALSE );
+            ulLen = hb_strRTrimLen( pFileName->szName, ulLen, HB_FALSE );
             pFileName->szName = hb_strLTrim( pFileName->szName, &ulLen );
             ( ( char * ) pFileName->szName )[ulLen] = '\0';
          }
          if( pFileName->szExtension )
          {
             ulLen = strlen( pFileName->szExtension );
-            ulLen = hb_strRTrimLen( pFileName->szExtension, ulLen, FALSE );
+            ulLen = hb_strRTrimLen( pFileName->szExtension, ulLen, HB_FALSE );
             pFileName->szExtension = hb_strLTrim( pFileName->szExtension, &ulLen );
             ( ( char * ) pFileName->szExtension )[ulLen] = '\0';
          }

harbour/src/rdd/hbsix/sxord.c

@@ -87,7 +87,7 @@
 #include "hbapifs.h"
 #include "hbapirdd.h"
 
-static BOOL hb_sxOrdParam( LPDBORDERINFO pInfo )
+static HB_BOOL hb_sxOrdParam( LPDBORDERINFO pInfo )
 {
    memset( pInfo, 0, sizeof( DBORDERINFO ) );
 
@@ -103,10 +103,10 @@ static BOOL hb_sxOrdParam( LPDBORDERINFO pInfo )
       {
          pInfo->atomBagName = hb_param( 2, HB_IT_NUMERIC );
          if( hb_parni( 2 ) <= 0 )
-            return FALSE;
+            return HB_FALSE;
       }
    }
-   return TRUE;
+   return HB_TRUE;
 }
 
 HB_FUNC( SX_TAGORDER )
@@ -185,8 +185,8 @@ HB_FUNC( SX_FREEZE )
 
       if( hb_sxOrdParam( &Info ) )
       {
-         BOOL fResult = FALSE;
-         Info.itmNewVal = hb_itemPutL( NULL, TRUE );
+         HB_BOOL fResult = HB_FALSE;
+         Info.itmNewVal = hb_itemPutL( NULL, HB_TRUE );
          Info.itmResult = hb_itemNew( NULL );
          if( SELF_ORDINFO( pArea, DBOI_CUSTOM, &Info ) == HB_SUCCESS )
             fResult = HB_IS_LOGICAL( Info.itmResult ) &&
@@ -208,8 +208,8 @@ HB_FUNC( SX_WARM )
 
       if( hb_sxOrdParam( &Info ) )
       {
-         BOOL fResult = FALSE;
-         Info.itmNewVal = hb_itemPutL( NULL, FALSE );
+         HB_BOOL fResult = HB_FALSE;
+         Info.itmNewVal = hb_itemPutL( NULL, HB_FALSE );
          Info.itmResult = hb_itemNew( NULL );
          if( SELF_ORDINFO( pArea, DBOI_CHGONLY, &Info ) == HB_SUCCESS )
             fResult = HB_IS_LOGICAL( Info.itmResult ) &&
@@ -231,8 +231,8 @@ HB_FUNC( SX_CHILL )
 
       if( hb_sxOrdParam( &Info ) )
       {
-         BOOL fResult = FALSE;
-         Info.itmNewVal = hb_itemPutL( NULL, TRUE );
+         HB_BOOL fResult = HB_FALSE;
+         Info.itmNewVal = hb_itemPutL( NULL, HB_TRUE );
          Info.itmResult = hb_itemNew( NULL );
          if( SELF_ORDINFO( pArea, DBOI_CHGONLY, &Info ) == HB_SUCCESS )
             fResult = HB_IS_LOGICAL( Info.itmResult ) &&
@@ -330,7 +330,7 @@ HB_FUNC( SX_SETSCOPE )
 HB_FUNC( SX_ISREINDEX )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fReindex = FALSE;
+   HB_BOOL fReindex = HB_FALSE;
 
    if( pArea )
    {
@@ -499,14 +499,14 @@ HB_FUNC( SX_DESCEND )
 HB_FUNC( SX_KEYADD )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
 
    if( pArea )
    {
       DBORDERINFO Info;
       if( hb_sxOrdParam( &Info ) )
       {
-         Info.itmResult = hb_itemPutL( NULL, FALSE );
+         Info.itmResult = hb_itemPutL( NULL, HB_FALSE );
          Info.itmNewVal = hb_param( 3 , HB_IT_ANY );
          SELF_ORDINFO( pArea, DBOI_KEYADD, &Info );
          fResult = hb_itemGetL( Info.itmResult );
@@ -519,14 +519,14 @@ HB_FUNC( SX_KEYADD )
 HB_FUNC( SX_KEYDROP )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
 
    if( pArea )
    {
       DBORDERINFO Info;
       if( hb_sxOrdParam( &Info ) )
       {
-         Info.itmResult = hb_itemPutL( NULL, FALSE );
+         Info.itmResult = hb_itemPutL( NULL, HB_FALSE );
          Info.itmNewVal = hb_param( 3 , HB_IT_ANY );
          SELF_ORDINFO( pArea, DBOI_KEYDELETE, &Info );
          fResult = hb_itemGetL( Info.itmResult );
@@ -555,7 +555,7 @@ HB_FUNC( SX_KEYDATA )
 HB_FUNC( SX_KEYSKIP )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fResult = FALSE, fBEof = FALSE;
+   HB_BOOL fResult = HB_FALSE, fBEof = HB_FALSE;
 
    if( pArea )
    {
@@ -611,7 +611,7 @@ HB_FUNC( SX_KEYNO )
 HB_FUNC( SX_KEYGOTO )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
 
    if( pArea && hb_parnl( 3 ) != 0 )
    {
@@ -647,17 +647,17 @@ HB_FUNC( SX_SKIPUNIQUE )
 HB_FUNC( SX_SEEKLAST )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fFound = FALSE;
+   HB_BOOL fFound = HB_FALSE;
 
    if( pArea && hb_pcount() > 0 )
    {
       PHB_ITEM pKey = hb_param( 1, HB_IT_ANY );
-      BOOL bSoftSeek = hb_parl( 2 );
+      HB_BOOL bSoftSeek = hb_parl( 2 );
 
-      if( SELF_SEEK( pArea, bSoftSeek, pKey, TRUE ) == HB_SUCCESS )
+      if( SELF_SEEK( pArea, bSoftSeek, pKey, HB_TRUE ) == HB_SUCCESS )
       {
          if( SELF_FOUND( pArea, &fFound ) != HB_SUCCESS )
-            fFound = FALSE;
+            fFound = HB_FALSE;
       }
    }
    hb_retl( fFound );
@@ -672,7 +672,7 @@ HB_FUNC( SX_TAGUNIQUE )
       DBORDERINFO Info;
       if( hb_sxOrdParam( &Info ) )
       {
-         Info.itmResult = hb_itemPutL( NULL, FALSE );
+         Info.itmResult = hb_itemPutL( NULL, HB_FALSE );
          SELF_ORDINFO( pArea, DBOI_UNIQUE, &Info );
          hb_itemReturnRelease( Info.itmResult );
       }
@@ -683,8 +683,8 @@ HB_FUNC( SX_WILDSEEK )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
    const char * szPattern = hb_parc( 1 );
-   BOOL fCont = hb_parl( 2 );
-   BOOL fFound = FALSE;
+   HB_BOOL fCont = hb_parl( 2 );
+   HB_BOOL fFound = HB_FALSE;
    int iOrder = 0;
 
    if( pArea )
@@ -733,15 +733,15 @@ HB_FUNC( SX_WILDSEEK )
 HB_FUNC( SX_ROXLOCK )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fLocked = FALSE;
+   HB_BOOL fLocked = HB_FALSE;
 
    if( pArea )
    {
       DBORDERINFO Info;
       if( hb_sxOrdParam( &Info ) )
       {
-         Info.itmNewVal = hb_itemPutL( NULL, TRUE );
-         Info.itmResult = hb_itemPutL( NULL, FALSE );
+         Info.itmNewVal = hb_itemPutL( NULL, HB_TRUE );
+         Info.itmResult = hb_itemPutL( NULL, HB_FALSE );
          if( SELF_ORDINFO( pArea, DBOI_READLOCK, &Info ) == HB_SUCCESS )
             fLocked = hb_itemGetL( Info.itmResult );
          hb_itemRelease( Info.itmNewVal );
@@ -760,8 +760,8 @@ HB_FUNC( SX_ROXUNLOCK )
       DBORDERINFO Info;
       if( hb_sxOrdParam( &Info ) )
       {
-         Info.itmNewVal = hb_itemPutL( NULL, FALSE );
-         Info.itmResult = hb_itemPutL( NULL, FALSE );
+         Info.itmNewVal = hb_itemPutL( NULL, HB_FALSE );
+         Info.itmResult = hb_itemPutL( NULL, HB_FALSE );
          SELF_ORDINFO( pArea, DBOI_READLOCK, &Info );
          hb_itemRelease( Info.itmNewVal );
          hb_itemRelease( Info.itmResult );
@@ -772,7 +772,7 @@ HB_FUNC( SX_ROXUNLOCK )
 HB_FUNC( SX_ISMYROX )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fLocked = FALSE;
+   HB_BOOL fLocked = HB_FALSE;
 
    if( pArea )
    {
@@ -791,7 +791,7 @@ HB_FUNC( SX_ISMYROX )
 HB_FUNC( SX_ISROXLOCK )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fLocked = FALSE;
+   HB_BOOL fLocked = HB_FALSE;
 
    if( pArea )
    {
@@ -803,12 +803,12 @@ HB_FUNC( SX_ISROXLOCK )
             fLocked = hb_itemGetL( Info.itmResult );
          if( !fLocked )
          {
-            Info.itmNewVal = hb_itemPutL( NULL, TRUE );
+            Info.itmNewVal = hb_itemPutL( NULL, HB_TRUE );
             if( SELF_ORDINFO( pArea, DBOI_READLOCK, &Info ) == HB_SUCCESS )
                fLocked = hb_itemGetL( Info.itmResult );
             if( fLocked )
             {
-               hb_itemPutL( Info.itmNewVal, FALSE );
+               hb_itemPutL( Info.itmNewVal, HB_FALSE );
                SELF_ORDINFO( pArea, DBOI_READLOCK, &Info );
             }
             hb_itemRelease( Info.itmNewVal );
@@ -822,7 +822,7 @@ HB_FUNC( SX_ISROXLOCK )
 HB_FUNC( SX_SORTOPTION )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fUseCurrent = TRUE;
+   HB_BOOL fUseCurrent = HB_TRUE;
 
    if( pArea )
    {

harbour/src/rdd/hbsix/sxsem.c

@@ -59,16 +59,16 @@
 #include "hbapirdd.h"
 
 
-static BOOL hb_sxSemName( char * szFileName )
+static HB_BOOL hb_sxSemName( char * szFileName )
 {
    const char * szName = hb_parc( 1 );
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
 
    if( szName && szName[0] )
    {
       hb_strncpy( szFileName, szName, HB_PATH_MAX - 1 );
       hb_strLower( szFileName, strlen( szFileName ) );
-      fResult = TRUE;
+      fResult = HB_TRUE;
    }
    else
    {
@@ -88,7 +88,7 @@ static BOOL hb_sxSemName( char * szFileName )
          {
             hb_strncpy( szFileName, szName, HB_PATH_MAX - 1 );
             hb_strLower( szFileName, strlen( szFileName ) );
-            fResult = TRUE;
+            fResult = HB_TRUE;
          }
          hb_itemRelease( pOrderInfo.itmResult );
       }
@@ -97,7 +97,7 @@ static BOOL hb_sxSemName( char * szFileName )
    return fResult;
 }
 
-static HB_FHANDLE hb_sxSemOpen( char * szFileName, BOOL * pfNewFile )
+static HB_FHANDLE hb_sxSemOpen( char * szFileName, HB_BOOL * pfNewFile )
 {
    HB_FHANDLE hFile;
    int i = 0;
@@ -117,7 +117,7 @@ static HB_FHANDLE hb_sxSemOpen( char * szFileName, BOOL * pfNewFile )
                                FXO_SHARELOCK | FXO_COPYNAME, NULL, NULL );
          if( hFile != FS_ERROR )
          {
-            *pfNewFile = TRUE;
+            *pfNewFile = HB_TRUE;
             break;
          }
       }
@@ -141,7 +141,7 @@ HB_FUNC( SX_MAKESEM )
    char szFileName[HB_PATH_MAX];
    BYTE buffer[2];
    int iUsers = -1;
-   BOOL fError = FALSE, fNewFile = FALSE;
+   HB_BOOL fError = HB_FALSE, fNewFile = HB_FALSE;
 
    if( hb_sxSemName( szFileName ) )
    {
@@ -154,7 +154,7 @@ HB_FUNC( SX_MAKESEM )
          {
             hb_fsSeek( hFile, 0, FS_SET );
             if( hb_fsRead( hFile, buffer, 2 ) != 2 )
-               fError = TRUE;
+               fError = HB_TRUE;
             else
                iUsers = HB_GET_LE_INT16( buffer ) + 1;
          }
@@ -163,7 +163,7 @@ HB_FUNC( SX_MAKESEM )
             HB_PUT_LE_UINT16( buffer, iUsers );
             hb_fsSeek( hFile, 0, FS_SET );
             if( hb_fsWrite( hFile, buffer, 2 ) != 2 )
-               fError = TRUE;
+               fError = HB_TRUE;
          }
          hb_fsClose( hFile );
       }

harbour/src/rdd/hbsix/sxtable.c

@@ -89,7 +89,7 @@ HB_FUNC( SX_GETLOCKS )
 HB_FUNC( SX_ISFLOCKED )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fLocked = FALSE;
+   HB_BOOL fLocked = HB_FALSE;
 
    if( pArea )
    {
@@ -105,7 +105,7 @@ HB_FUNC( SX_ISFLOCKED )
 HB_FUNC( SX_ISREADONLY )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fReadOnly = FALSE;
+   HB_BOOL fReadOnly = HB_FALSE;
 
    if( pArea )
    {
@@ -121,7 +121,7 @@ HB_FUNC( SX_ISREADONLY )
 HB_FUNC( SX_ISSHARED )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fShared = FALSE;
+   HB_BOOL fShared = HB_FALSE;
 
    if( pArea )
    {
@@ -195,7 +195,7 @@ static void hb_sxRollBackChild( AREAP pArea, PHB_ITEM pItem )
 
 HB_FUNC( SX_ROLLBACK )
 {
-   BOOL fResult = FALSE, fRollChild = FALSE;
+   HB_BOOL fResult = HB_FALSE, fRollChild = HB_FALSE;
    int iArea = 0;
    AREAP pArea;
 
@@ -225,13 +225,13 @@ HB_FUNC( SX_ROLLBACK )
 HB_FUNC( SX_RLOCK )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
    PHB_ITEM pResult = NULL, pRecords;
 
    if( pArea )
    {
       DBLOCKINFO dbLockInfo;
-      dbLockInfo.fResult = FALSE;
+      dbLockInfo.fResult = HB_FALSE;
       dbLockInfo.uiMethod = DBLM_MULTIPLE;
       pRecords = hb_param( 1, HB_IT_ARRAY );
       if( pRecords )
@@ -284,7 +284,7 @@ HB_FUNC( SX_UNLOCK )
 HB_FUNC( SX_SETPASS )
 {
    int iPCount = hb_pcount();
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
    PHB_ITEM pItem;
 
    if( iPCount >=1 )
@@ -296,7 +296,7 @@ HB_FUNC( SX_SETPASS )
          {
             pItem = hb_itemParam( 1 );
             if( SELF_INFO( pArea, DBI_PASSWORD, pItem ) == HB_SUCCESS )
-               fResult = TRUE;
+               fResult = HB_TRUE;
             hb_itemRelease( pItem );
          }
       }
@@ -323,7 +323,7 @@ HB_FUNC( SX_SETPASS )
          {
             pItem = hb_itemParam( 1 );
             if( SELF_RDDINFO( pRDDNode, RDDI_PENDINGPASSWORD, hb_parnl( 4 ), pItem ) == HB_SUCCESS )
-               fResult = TRUE;
+               fResult = HB_TRUE;
             hb_itemRelease( pItem );
          }
       }
@@ -362,7 +362,7 @@ HB_FUNC( SX_SETPASS )
 HB_FUNC( SX_DBFENCRYPT )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
 
    if( pArea )
    {
@@ -382,7 +382,7 @@ HB_FUNC( SX_DBFENCRYPT )
 HB_FUNC( SX_DBFDECRYPT )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
 
    if( pArea )
    {
@@ -397,7 +397,7 @@ HB_FUNC( SX_DBFDECRYPT )
 HB_FUNC( SX_MEMOPACK )
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
 
    if( pArea )
    {
@@ -421,11 +421,11 @@ HB_FUNC( SX_TURBOAREA )
       if( hb_pcount() > 0 && HB_IS_NIL( pItem ) )
          hb_itemPutNI( pItem, 0 );
       if( SELF_INFO( pArea, DBI_DIRTYREAD, pItem ) != HB_SUCCESS )
-         hb_itemPutL( pItem, FALSE );
+         hb_itemPutL( pItem, HB_FALSE );
       hb_itemReturnRelease( pItem );
    }
    else
-      hb_retl( FALSE );
+      hb_retl( HB_FALSE );
 }
 
 HB_FUNC( SX_SETTURBO )
@@ -448,7 +448,7 @@ HB_FUNC( SX_SETTURBO )
       if( hb_pcount() > 0 && HB_IS_NIL( pItem ) )
          hb_itemPutNI( pItem, 0 );
       if( SELF_RDDINFO( pRDDNode, RDDI_DIRTYREAD, 0, pItem ) != HB_SUCCESS )
-         hb_itemPutL( pItem, FALSE );
+         hb_itemPutL( pItem, HB_FALSE );
       hb_itemReturnRelease( pItem );
    }
 }

harbour/src/rdd/hbsix/sxutil.c

@@ -92,9 +92,9 @@ HB_FUNC( SX_SLIMFAST )
 HB_FUNC( SX_WILDMATCH )
 {
    const char * szPattern = hb_parc( 1 ), * szValue = hb_parc( 2 );
-   BOOL fMatch = FALSE;
+   HB_BOOL fMatch = HB_FALSE;
 
-   if( szPattern && szPattern[0] && szValue )
+   if( szPattern && szPattern[ 0 ] && szValue )
       fMatch = hb_strMatchWild( szValue, szPattern );
 
    hb_retl( fMatch );

harbour/src/rdd/hsx/hsx.c

@@ -309,21 +309,21 @@ typedef struct _HSXINFO
    int        iHandle;          /* HSX handle */
    ULONG      ulRecCount;       /* number of records */
    USHORT     uiRecordSize;     /* record size in bytes */
-   BOOL       fIgnoreCase;      /* ignore case */
+   HB_BOOL    fIgnoreCase;      /* ignore case */
    int        iFilterType;      /* character filter */
-   BOOL       fUseHash;         /* use Hash functions for alphas */
+   HB_BOOL    fUseHash;         /* use Hash functions for alphas */
 
    PHB_FILE   pFile;            /* file handle */
    char *     szFileName;       /* file name */
-   BOOL       fShared;          /* Shared file */
-   BOOL       fReadonly;        /* Read only file */
+   HB_BOOL    fShared;          /* Shared file */
+   HB_BOOL    fReadonly;        /* Read only file */
    ULONG      ulBufSize;        /* size of buffer in records */
    ULONG      ulBufRec;         /* number of record in buffer */
    ULONG      ulFirstRec;       /* first record in the buffer */
    BYTE *     pBuffer;          /* the buffer pointer */
-   BOOL       fChanged;         /* the buffer is changed and should be written to index file */
-   BOOL       fHdrChanged;      /* new records, header file has to be updated */
-   BOOL       fWrLocked;        /* the index is locked for writing */
+   HB_BOOL    fChanged;         /* the buffer is changed and should be written to index file */
+   HB_BOOL    fHdrChanged;      /* new records, header file has to be updated */
+   HB_BOOL    fWrLocked;        /* the index is locked for writing */
 
    char *     pSearchVal;       /* current search value for HS_NEXT */
    ULONG      ulSearch;         /* the length of search value */
@@ -334,7 +334,7 @@ typedef struct _HSXINFO
    int        iArea;            /* work area number if bound with WA or 0 */
    char *     szKeyExpr;        /* key expression when bound with WA for automatic update */
    PHB_ITEM   pKeyItem;         /* item with compiled key expression */
-   BOOL       fFlush;           /* data was written to file and not commited */
+   HB_BOOL    fFlush;           /* data was written to file and not commited */
 } HSXINFO;
 typedef HSXINFO * LPHSXINFO;
 
@@ -416,7 +416,7 @@ static const UCHAR hb_hsxHashArray[] = {
 /* Z */  42,  4,  4,  4, 56,  4,  4,  4, 24,  4,  4,  4,  4,  4, 41,  4,  4,  4,  4,  4,  4,  4,  4,  4,  3,  4 };
 
 static int hb_hsxHashVal( int c1, int c2, int iKeyBits,
-                          BOOL fNoCase, int iFilter, BOOL fUseHash )
+                          HB_BOOL fNoCase, int iFilter, HB_BOOL fUseHash )
 {
    int iBitNum;
 
@@ -460,7 +460,7 @@ static int hb_hsxHashVal( int c1, int c2, int iKeyBits,
 }
 
 static void hb_hsxHashStr( const char * pStr, ULONG ulLen, BYTE * pKey, int iKeySize,
-                           BOOL fNoCase, int iFilter, BOOL fUseHash )
+                           HB_BOOL fNoCase, int iFilter, HB_BOOL fUseHash )
 {
    int c1, c2, iBitNum, iKeyBits = iKeySize << 3;
 
@@ -492,9 +492,9 @@ static void hb_hsxHashStr( const char * pStr, ULONG ulLen, BYTE * pKey, int iKey
 }
 
 static int hb_hsxStrCmp( const char * pSub, ULONG ulSub, const char * pStr, ULONG ulLen,
-                         BOOL fNoCase, int iFilter )
+                         HB_BOOL fNoCase, int iFilter )
 {
-   BOOL fResult = FALSE;
+   HB_BOOL fResult = HB_FALSE;
    UCHAR c1, c2;
    ULONG ul;
 
@@ -503,7 +503,7 @@ static int hb_hsxStrCmp( const char * pSub, ULONG ulSub, const char * pStr, ULON
 
    while( !fResult && ulLen >= ulSub )
    {
-      fResult = TRUE;
+      fResult = HB_TRUE;
       for( ul = 0; fResult && ul < ulSub; ul++ )
       {
          c1 = ( UCHAR ) pSub[ ul ];
@@ -581,7 +581,7 @@ static int hb_hsxCompile( const char * szExpr, PHB_ITEM * pExpr )
    return HSX_SUCCESS;
 }
 
-static int hb_hsxEval( int iHandle, PHB_ITEM pExpr, BYTE *pKey, BOOL *fDeleted )
+static int hb_hsxEval( int iHandle, PHB_ITEM pExpr, BYTE *pKey, HB_BOOL *fDeleted )
 {
    LPHSXINFO pHSX = hb_hsxGetPointer( iHandle );
    int iResult = HSX_SUCCESS;
@@ -602,7 +602,7 @@ static int hb_hsxEval( int iHandle, PHB_ITEM pExpr, BYTE *pKey, BOOL *fDeleted )
       pStr = hb_itemGetCPtr( pExpr );
       ulLen = hb_itemGetCLen( pExpr );
       if( fDeleted )
-         *fDeleted = FALSE;
+         *fDeleted = HB_FALSE;
    }
    else
    {
@@ -624,7 +624,7 @@ static int hb_hsxEval( int iHandle, PHB_ITEM pExpr, BYTE *pKey, BOOL *fDeleted )
       {
          AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
          if( !pArea )
-            *fDeleted = FALSE;
+            *fDeleted = HB_FALSE;
          else if( SELF_DELETED( pArea, fDeleted ) == HB_FAILURE )
             iResult = HSX_RDDFAILURE;
       }
@@ -677,8 +677,8 @@ static int hb_hsxHdrFlush( int iHandle )
       if( hb_fileWriteAt( pHSX->pFile, headrBuf, HSXHEADER_LEN, 0 ) != HSXHEADER_LEN )
          return HSX_BADHDRWRITE;
 
-      pHSX->fHdrChanged = FALSE;
-      pHSX->fFlush = TRUE;
+      pHSX->fHdrChanged = HB_FALSE;
+      pHSX->fFlush = HB_TRUE;
    }
    return HSX_SUCCESS;
 }
@@ -703,8 +703,8 @@ static int hb_hsxFlush( int iHandle )
       if( hb_fileWriteAt( pHSX->pFile, pHSX->pBuffer, ulSize, fOffset ) != ulSize )
          return HSX_BADWRITE;
 
-      pHSX->fChanged = FALSE;
-      pHSX->fFlush = TRUE;
+      pHSX->fChanged = HB_FALSE;
+      pHSX->fFlush = HB_TRUE;
    }
    return HSX_SUCCESS;
 }
@@ -755,7 +755,7 @@ static int hb_hsxHdrRead( int iHandle )
 static int hb_hsxRead( int iHandle, ULONG ulRecord, BYTE ** pRecPtr )
 {
    LPHSXINFO pHSX = hb_hsxGetPointer( iHandle );
-   BOOL fCount = pHSX->fShared;
+   HB_BOOL fCount = pHSX->fShared;
 
    if( ! pHSX )
       return HSX_BADHANDLE;
@@ -763,7 +763,7 @@ static int hb_hsxRead( int iHandle, ULONG ulRecord, BYTE ** pRecPtr )
    if( ulRecord > pHSX->ulRecCount && fCount )
    {
       hb_hsxGetRecCount( pHSX );
-      fCount = FALSE;
+      fCount = HB_FALSE;
    }
 
    if( ulRecord == 0 || ulRecord > pHSX->ulRecCount )
@@ -833,7 +833,7 @@ static int hb_hsxAppend( int iHandle, ULONG * pulRecNo, BYTE **pRecPtr )
       *pulRecNo = ++pHSX->ulRecCount;
    }
    *pRecPtr = pHSX->pBuffer + ( pHSX->ulBufRec - 1 ) * pHSX->uiRecordSize;
-   pHSX->fHdrChanged = TRUE;
+   pHSX->fHdrChanged = HB_TRUE;
 
    return HSX_SUCCESS;
 }
@@ -880,7 +880,7 @@ static int hb_hsxLock( int iHandle, int iAction, ULONG ulRecord )
 {
    LPHSXINFO pHSX = hb_hsxGetPointer( iHandle );
    int iRetVal = HSX_SUCCESS, iRet;
-   BOOL fResult;
+   HB_BOOL fResult;
 
    HB_SYMBOL_UNUSED( ulRecord );
 
@@ -930,7 +930,7 @@ static int hb_hsxLock( int iHandle, int iAction, ULONG ulRecord )
                if( iAction == HSX_APPENDLOCK )
                   hb_hsxGetRecCount( pHSX );
                else if( iAction == HSX_WRITELOCK )
-                  pHSX->fWrLocked = TRUE;
+                  pHSX->fWrLocked = HB_TRUE;
             }
             break;
 
@@ -964,7 +964,7 @@ static int hb_hsxLock( int iHandle, int iAction, ULONG ulRecord )
          case HSX_APPENDUNLOCK:
             iRetVal = hb_hsxFlush( iHandle );
             if( iAction == HSX_APPENDLOCK )
-               pHSX->fWrLocked = FALSE;
+               pHSX->fWrLocked = HB_FALSE;
          case HSX_HDRWRITEUNLOCK:
             iRet = hb_hsxHdrFlush( iHandle );
             if( iRetVal == HSX_SUCCESS )
@@ -1023,7 +1023,7 @@ static int hb_hsxDelete( int iHandle, ULONG ulRecord )
          else
          {
             *pRecPtr |= 0x80;
-            pHSX->fChanged = TRUE;
+            pHSX->fChanged = HB_TRUE;
             iRetVal = HSX_SUCCESS;
          }
       }
@@ -1055,7 +1055,7 @@ static int hb_hsxUnDelete( int iHandle, ULONG ulRecord )
          else
          {
             *pRecPtr &= ~0x80;
-            pHSX->fChanged = TRUE;
+            pHSX->fChanged = HB_TRUE;
             iRetVal = HSX_SUCCESS;
          }
       }
@@ -1066,7 +1066,7 @@ static int hb_hsxUnDelete( int iHandle, ULONG ulRecord )
    return iRetVal;
 }
 
-static int hb_hsxReplace( int iHandle, ULONG ulRecord, PHB_ITEM pExpr, BOOL fDeleted )
+static int hb_hsxReplace( int iHandle, ULONG ulRecord, PHB_ITEM pExpr, HB_BOOL fDeleted )
 {
    LPHSXINFO pHSX = hb_hsxGetPointer( iHandle );
    int iRetVal, iRet;
@@ -1087,7 +1087,7 @@ static int hb_hsxReplace( int iHandle, ULONG ulRecord, PHB_ITEM pExpr, BOOL fDel
          {
             if( fDeleted )
                *pRecPtr |= 0x80;
-            pHSX->fChanged = TRUE;
+            pHSX->fChanged = HB_TRUE;
          }
       }
       iRet = hb_hsxLock( iHandle, HSX_WRITEUNLOCK, ulRecord );
@@ -1097,7 +1097,7 @@ static int hb_hsxReplace( int iHandle, ULONG ulRecord, PHB_ITEM pExpr, BOOL fDel
    return iRetVal;
 }
 
-static int hb_hsxAdd( int iHandle, ULONG *pulRecNo, PHB_ITEM pExpr, BOOL fDeleted )
+static int hb_hsxAdd( int iHandle, ULONG *pulRecNo, PHB_ITEM pExpr, HB_BOOL fDeleted )
 {
    LPHSXINFO pHSX = hb_hsxGetPointer( iHandle );
    int iRetVal, iRet;
@@ -1122,7 +1122,7 @@ static int hb_hsxAdd( int iHandle, ULONG *pulRecNo, PHB_ITEM pExpr, BOOL fDelete
          {
             if( fDeleted )
                *pRecPtr |= 0x80;
-            pHSX->fChanged = TRUE;
+            pHSX->fChanged = HB_TRUE;
             if( pulRecNo )
                *pulRecNo = ulRecNo;
          }
@@ -1377,7 +1377,7 @@ static int hb_hsxDestroy( int iHandle )
 }
 
 static int hb_hsxCreate( const char * szFile, int iBufSize, int iKeySize,
-                         BOOL fIgnoreCase, int iFilter, PHB_ITEM pExpr )
+                         HB_BOOL fIgnoreCase, int iFilter, PHB_ITEM pExpr )
 {
    char szFileName[ HB_PATH_MAX ];
    const char * szExpr = NULL;
@@ -1438,8 +1438,8 @@ static int hb_hsxCreate( const char * szFile, int iBufSize, int iKeySize,
    pHSX = hb_hsxNew();
    pHSX->pFile = pFile;
    pHSX->szFileName = hb_strdup( szFileName );
-   pHSX->fShared = FALSE;
-   pHSX->fReadonly = FALSE;
+   pHSX->fShared = HB_FALSE;
+   pHSX->fReadonly = HB_FALSE;
    pHSX->uiRecordSize = uiRecordSize;
    pHSX->fIgnoreCase = fIgnoreCase;
    pHSX->iFilterType = iFilter;
@@ -1455,7 +1455,7 @@ static int hb_hsxCreate( const char * szFile, int iBufSize, int iKeySize,
    }
    pHSX->ulBufSize = ulBufSize;
 
-   pHSX->fHdrChanged = TRUE;
+   pHSX->fHdrChanged = HB_TRUE;
    iRetVal = hb_hsxHdrFlush( pHSX->iHandle );
    if( iRetVal != HSX_SUCCESS )
    {
@@ -1469,7 +1469,7 @@ static int hb_hsxCreate( const char * szFile, int iBufSize, int iKeySize,
 static int hb_hsxOpen( const char * szFile, int iBufSize, int iMode )
 {
    char szFileName[ HB_PATH_MAX ];
-   BOOL fShared, fReadonly;
+   HB_BOOL fShared, fReadonly;
    PHB_FILE pFile;
    ULONG ulBufSize;
    USHORT uiFlags;
@@ -1495,7 +1495,7 @@ static int hb_hsxOpen( const char * szFile, int iBufSize, int iMode )
    fReadonly = ( iMode & 0x02 ) != 0;
    fShared = ( iMode & 0x01 ) == 0;
    if( hb_setGetAutoShare() == 2 )
-      fShared = FALSE;
+      fShared = HB_FALSE;
    uiFlags = ( fReadonly ? FO_READ : FO_READWRITE ) |
              ( fShared ? FO_DENYNONE : FO_EXCLUSIVE );
 
@@ -1541,7 +1541,7 @@ static int hb_hsxOpen( const char * szFile, int iBufSize, int iMode )
 }
 
 static int hb_hsxIndex( const char * szFile, PHB_ITEM pExpr, int iKeySize,
-                        int iMode, int iBufSize, BOOL fIgnoreCase, int iFilter )
+                        int iMode, int iBufSize, HB_BOOL fIgnoreCase, int iFilter )
 {
    int iRetVal = HSX_SUCCESS, iHandle;
    ULONG ulRecNo = 0, ulRecCount = 0, ulNewRec, ulRec;
@@ -1569,7 +1569,7 @@ static int hb_hsxIndex( const char * szFile, PHB_ITEM pExpr, int iKeySize,
             errCode = SELF_GOTO( pArea, ulRec );
             if( errCode == HB_FAILURE )
                break;
-            iRetVal = hb_hsxAdd( iHandle, &ulNewRec, NULL, FALSE );
+            iRetVal = hb_hsxAdd( iHandle, &ulNewRec, NULL, HB_FALSE );
             if( iRetVal != HSX_SUCCESS )
                break;
             if( ulNewRec != ulRec )
@@ -1601,7 +1601,7 @@ static int hb_hsxFilter( int iHandle, const char * pSeek, ULONG ulSeek,
 {
    AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer();
    LPHSXINFO pHSX = hb_hsxGetPointer( iHandle );
-   BOOL fDestroyExpr = FALSE, fValid;
+   HB_BOOL fDestroyExpr = HB_FALSE, fValid;
    int iResult = HSX_SUCCESS;
    HB_ERRCODE errCode;
    ULONG ulRecNo = 0, ulRec;
@@ -1625,7 +1625,7 @@ static int hb_hsxFilter( int iHandle, const char * pSeek, ULONG ulSeek,
          iResult = hb_hsxCompile( hb_itemGetCPtr( pVerify ), &pVerify );
          if( iResult != HSX_SUCCESS )
             return HSX_BADPARMS;
-         fDestroyExpr = TRUE;
+         fDestroyExpr = HB_TRUE;
       }
       else if( hb_itemType( pVerify ) != HB_IT_BLOCK )
       {
@@ -1637,7 +1637,7 @@ static int hb_hsxFilter( int iHandle, const char * pSeek, ULONG ulSeek,
    if( errCode != HB_FAILURE )
       iResult = hb_hsxSeekSet( iHandle, pSeek, ulSeek );
 
-   fValid = TRUE;
+   fValid = HB_TRUE;
    pItem = hb_itemNew( NULL );
    while( iResult == HSX_SUCCESS && errCode != HB_FAILURE )
    {
@@ -1832,7 +1832,7 @@ HB_FUNC( HS_FILTER )
    char * pBuff = NULL;
    ULONG ulLen = hb_parclen( 2 ), ulRecords = 0, ull, ul;
    int iHandle = -1, iResult = HSX_BADPARMS;
-   BOOL fNew = FALSE, fToken = TRUE;
+   HB_BOOL fNew = HB_FALSE, fToken = HB_TRUE;
 
    if( hb_parclen( 1 ) > 0 )
    {
@@ -1841,7 +1841,7 @@ HB_FUNC( HS_FILTER )
          iHandle = hb_hsxOpen( hb_parc( 1 ), hb_parni( 4 ),
                hb_param( 5, HB_IT_NUMERIC ) ? hb_parni( 5 ) : HSXDEFOPENMODE );
          if( iHandle >= 0 )
-            fNew = TRUE;
+            fNew = HB_TRUE;
          else
             iResult = iHandle;
       }
@@ -1864,7 +1864,7 @@ HB_FUNC( HS_FILTER )
                memcpy( pBuff, pHSX->pSearchVal, ulLen );
                pBuff[ ulLen ] = '\0';
                szText = pBuff;
-               fToken = FALSE;
+               fToken = HB_FALSE;
             }
          }
       }
@@ -1988,7 +1988,7 @@ HB_FUNC( HS_VERIFY )
       PHB_ITEM pExpr = hb_param( 1, HB_IT_BLOCK );
       const char * szSub = hb_parc( 2 ), * szText = NULL;
       ULONG ulSub = hb_parclen( 2 ), ulLen = 0;
-      BOOL fIgnoreCase = hb_parl( 3 );
+      HB_BOOL fIgnoreCase = hb_parl( 3 );
 
       if( ulSub )
       {

harbour/src/rdd/nulsys/nulsys.c

@@ -158,7 +158,7 @@ HB_FUNC( DBGOTOP ) {}
 
 HB_FUNC( DBGOBOTTOM ) {}
 
-HB_FUNC( DBSEEK ) { hb_retl( FALSE ); }
+HB_FUNC( DBSEEK ) { hb_retl( HB_FALSE ); }
 
 HB_FUNC( DBSKIP ) { hb_retni( 0 ); }
 
@@ -172,9 +172,9 @@ HB_FUNC( DBRECALL ) {}
 
 HB_FUNC( DBDELETE ) {}
 
-HB_FUNC( DBRLOCK ) { hb_retl( FALSE ); }
+HB_FUNC( DBRLOCK ) { hb_retl( HB_FALSE ); }
 
-HB_FUNC( DBUNLOCK ) { hb_retl( FALSE ); }
+HB_FUNC( DBUNLOCK ) { hb_retl( HB_FALSE ); }
 
 HB_FUNC( DBRELATION ) { hb_retc_null(); }
 
@@ -188,23 +188,23 @@ HB_FUNC( SELECT ) { hb_retni( 0 ); }
 
 HB_FUNC( ALIAS ) { hb_retc_null(); }
 
-HB_FUNC( USED ) { hb_retl( FALSE ); }
+HB_FUNC( USED ) { hb_retl( HB_FALSE ); }
 
-HB_FUNC( NETERR ) { hb_retl( FALSE ); }
+HB_FUNC( NETERR ) { hb_retl( HB_FALSE ); }
 
-HB_FUNC( LOCK ) { hb_retl( FALSE ); }
+HB_FUNC( LOCK ) { hb_retl( HB_FALSE ); }
 
-HB_FUNC( FLOCK ) { hb_retl( FALSE ); }
+HB_FUNC( FLOCK ) { hb_retl( HB_FALSE ); }
 
-HB_FUNC( RLOCK ) { hb_retl( FALSE ); }
+HB_FUNC( RLOCK ) { hb_retl( HB_FALSE ); }
 
-HB_FUNC( BOF ) { hb_retl( FALSE ); }
+HB_FUNC( BOF ) { hb_retl( HB_FALSE ); }
 
-HB_FUNC( EOF ) { hb_retl( FALSE ); }
+HB_FUNC( EOF ) { hb_retl( HB_FALSE ); }
 
-HB_FUNC( FOUND ) { hb_retl( FALSE ); }
+HB_FUNC( FOUND ) { hb_retl( HB_FALSE ); }
 
-HB_FUNC( DELETED ) { hb_retl( FALSE ); }
+HB_FUNC( DELETED ) { hb_retl( HB_FALSE ); }
 
 HB_FUNC( RECNO ) { hb_retni( 0 ); }
 

harbour/src/rdd/sdf1.c

@@ -112,14 +112,14 @@ static HB_ERRCODE hb_sdfReadRecord( SDFAREAP pArea )
 
    if( uiRead == 0 )
    {
-      pArea->area.fEof = TRUE;
-      pArea->fPositioned = FALSE;
+      pArea->area.fEof = HB_TRUE;
+      pArea->fPositioned = HB_FALSE;
       hb_sdfClearRecordBuffer( pArea );
    }
    else
    {
-      pArea->area.fEof = FALSE;
-      pArea->fPositioned = TRUE;
+      pArea->area.fEof = HB_FALSE;
+      pArea->fPositioned = HB_TRUE;
       uiEolPos = ( USHORT ) hb_strAt( pArea->szEol, pArea->uiEolLen,
                                       ( char * ) pArea->pRecord, uiRead );
       if( uiEolPos )
@@ -206,8 +206,8 @@ static HB_ERRCODE hb_sdfNextRecord( SDFAREAP pArea )
 
    if( pArea->ulNextOffset == ( HB_FOFFSET ) -1 )
    {
-      pArea->area.fEof = TRUE;
-      pArea->fPositioned = FALSE;
+      pArea->area.fEof = HB_TRUE;
+      pArea->fPositioned = HB_FALSE;
       hb_sdfClearRecordBuffer( pArea );
       return HB_SUCCESS;
    }
@@ -230,8 +230,8 @@ static HB_ERRCODE hb_sdfGoTop( SDFAREAP pArea )
    if( SELF_GOCOLD( ( AREAP ) pArea ) != HB_SUCCESS )
       return HB_FAILURE;
 
-   pArea->area.fTop = TRUE;
-   pArea->area.fBottom = FALSE;
+   pArea->area.fTop = HB_TRUE;
+   pArea->area.fBottom = HB_FALSE;
 
    pArea->ulRecordOffset = 0;
    pArea->ulRecNo = 1;
@@ -260,13 +260,13 @@ static HB_ERRCODE hb_sdfSkipRaw( SDFAREAP pArea, LONG lToSkip )
 /*
  * Determine deleted status for a record.
  */
-static HB_ERRCODE hb_sdfDeleted( SDFAREAP pArea, BOOL * pDeleted )
+static HB_ERRCODE hb_sdfDeleted( SDFAREAP pArea, HB_BOOL * pDeleted )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_sdfDeleted(%p,%p)", pArea, pDeleted));
 
    HB_SYMBOL_UNUSED( pArea );
 
-   * pDeleted = FALSE;
+   * pDeleted = HB_FALSE;
 
    return HB_SUCCESS;
 }
@@ -325,7 +325,7 @@ static HB_ERRCODE hb_sdfRecId( SDFAREAP pArea, PHB_ITEM pRecNo )
 /*
  * Append a record to the WorkArea.
  */
-static HB_ERRCODE hb_sdfAppend( SDFAREAP pArea, BOOL fUnLockAll )
+static HB_ERRCODE hb_sdfAppend( SDFAREAP pArea, HB_BOOL fUnLockAll )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_sdfAppend(%p,%d)", pArea, (int) fUnLockAll));
 
@@ -339,8 +339,8 @@ static HB_ERRCODE hb_sdfAppend( SDFAREAP pArea, BOOL fUnLockAll )
 
    pArea->ulRecordOffset = pArea->ulFileSize;
    pArea->ulRecNo = ++pArea->ulRecCount;
-   pArea->area.fEof = FALSE;
-   pArea->fPositioned = TRUE;
+   pArea->area.fEof = HB_FALSE;
+   pArea->fPositioned = HB_TRUE;
    hb_sdfClearRecordBuffer( pArea );
 
    return HB_SUCCESS;
@@ -356,8 +356,8 @@ static HB_ERRCODE hb_sdfDeleteRec( SDFAREAP pArea )
    if( pArea->fRecordChanged )
    {
       pArea->ulRecCount--;
-      pArea->area.fEof = TRUE;
-      pArea->fPositioned = pArea->fRecordChanged = FALSE;
+      pArea->area.fEof = HB_TRUE;
+      pArea->fPositioned = pArea->fRecordChanged = HB_FALSE;
       hb_sdfClearRecordBuffer( pArea );
    }
 
@@ -399,10 +399,10 @@ static HB_ERRCODE hb_sdfGetValue( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem
             case 't':
             case 'Y':
             case 'y':
-               hb_itemPutL( pItem, TRUE );
+               hb_itemPutL( pItem, HB_TRUE );
                break;
             default:
-               hb_itemPutL( pItem, FALSE );
+               hb_itemPutL( pItem, HB_FALSE );
                break;
          }
          break;
@@ -415,7 +415,7 @@ static HB_ERRCODE hb_sdfGetValue( SDFAREAP pArea, USHORT uiIndex, PHB_ITEM pItem
          {
             HB_LONG lVal;
             double dVal;
-            BOOL fDbl;
+            HB_BOOL fDbl;
 
             fDbl = hb_strnToNum( (const char *) pArea->pRecord + pArea->pFieldOffset[ uiIndex ],
                                  pField->uiLen, &lVal, &dVal );
@@ -626,7 +626,7 @@ static HB_ERRCODE hb_sdfTrans( SDFAREAP pArea, LPDBTRANSINFO pTransInfo )
          pTransInfo->uiFlags |= DBTF_PUTREC;
       else
       {
-         PHB_ITEM pPutRec = hb_itemPutL( NULL, FALSE );
+         PHB_ITEM pPutRec = hb_itemPutL( NULL, HB_FALSE );
          if( SELF_INFO( ( AREAP ) pTransInfo->lpaDest, DBI_CANPUTREC, pPutRec ) != HB_SUCCESS )
          {
             hb_itemRelease( pPutRec );
@@ -669,8 +669,8 @@ static HB_ERRCODE hb_sdfGoCold( SDFAREAP pArea )
       }
       pArea->ulFileSize += ulWrite;
       pArea->ulNextOffset = pArea->ulFileSize;
-      pArea->fRecordChanged = FALSE;
-      pArea->fFlush = TRUE;
+      pArea->fRecordChanged = HB_FALSE;
+      pArea->fFlush = HB_TRUE;
    }
    return HB_SUCCESS;
 }
@@ -694,7 +694,7 @@ static HB_ERRCODE hb_sdfGoHot( SDFAREAP pArea )
       hb_itemRelease( pError );
       return HB_FAILURE;
    }
-   pArea->fRecordChanged = TRUE;
+   pArea->fRecordChanged = HB_TRUE;
    return HB_SUCCESS;
 }
 
@@ -715,7 +715,7 @@ static HB_ERRCODE hb_sdfFlush( SDFAREAP pArea )
       if( hb_setGetHardCommit() )
       {
          hb_fileCommit( pArea->pFile );
-         pArea->fFlush = FALSE;
+         pArea->fFlush = HB_FALSE;
       }
    }
 
@@ -797,7 +797,7 @@ static HB_ERRCODE hb_sdfAddField( SDFAREAP pArea, LPDBFIELDINFO pFieldInfo )
       case HB_FT_OLE:
          pFieldInfo->uiType = HB_FT_MEMO;
          pFieldInfo->uiLen = 0;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       case HB_FT_ANY:
@@ -816,14 +816,14 @@ static HB_ERRCODE hb_sdfAddField( SDFAREAP pArea, LPDBFIELDINFO pFieldInfo )
             pFieldInfo->uiType = HB_FT_MEMO;
             pFieldInfo->uiLen = 0;
          }
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       case HB_FT_DATE:
          if( pFieldInfo->uiLen != 8 )
          {
             pFieldInfo->uiLen = 8;
-            pArea->fTransRec = FALSE;
+            pArea->fTransRec = HB_FALSE;
          }
          break;
 
@@ -839,26 +839,26 @@ static HB_ERRCODE hb_sdfAddField( SDFAREAP pArea, LPDBFIELDINFO pFieldInfo )
          pFieldInfo->uiLen = s_uiNumLength[ pFieldInfo->uiLen ];
          if( pFieldInfo->uiDec )
             pFieldInfo->uiLen++;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       case HB_FT_DOUBLE:
       case HB_FT_CURDOUBLE:
          pFieldInfo->uiType = HB_FT_LONG;
          pFieldInfo->uiLen = 20;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       case HB_FT_VARLENGTH:
          pFieldInfo->uiType = HB_FT_STRING;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       case HB_FT_LOGICAL:
          if( pFieldInfo->uiLen != 1 )
          {
             pFieldInfo->uiLen = 1;
-            pArea->fTransRec = FALSE;
+            pArea->fTransRec = HB_FALSE;
          }
          break;
 
@@ -869,20 +869,20 @@ static HB_ERRCODE hb_sdfAddField( SDFAREAP pArea, LPDBFIELDINFO pFieldInfo )
       case HB_FT_TIME:
          pFieldInfo->uiType = HB_FT_STRING;
          pFieldInfo->uiLen = 12;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       case HB_FT_TIMESTAMP:
       case HB_FT_MODTIME:
          pFieldInfo->uiType = HB_FT_STRING;
          pFieldInfo->uiLen = 23;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
 
       default:
          pFieldInfo->uiType = HB_FT_NONE;
          pFieldInfo->uiLen = 0;
-         pArea->fTransRec = FALSE;
+         pArea->fTransRec = HB_FALSE;
          break;
    }
 
@@ -924,7 +924,7 @@ static HB_ERRCODE hb_sdfNewArea( SDFAREAP pArea )
       return HB_FAILURE;
 
    pArea->pFile = NULL;
-   pArea->fTransRec = TRUE;
+   pArea->fTransRec = HB_TRUE;
    pArea->uiRecordLen = 0;
 
    return HB_SUCCESS;
@@ -991,13 +991,13 @@ static HB_ERRCODE hb_sdfCreate( SDFAREAP pArea, LPDBOPENINFO pCreateInfo )
    HB_ERRCODE errCode;
    PHB_FNAME pFileName;
    PHB_ITEM pError = NULL;
-   BOOL fRetry;
+   HB_BOOL fRetry;
    char szFileName[ HB_PATH_MAX ];
 
    HB_TRACE(HB_TR_DEBUG, ("hb_sdfCreate(%p,%p)", pArea, pCreateInfo));
 
-   pArea->fShared = FALSE;    /* pCreateInfo->fShared; */
-   pArea->fReadonly = FALSE;  /* pCreateInfo->fReadonly */
+   pArea->fShared = HB_FALSE;    /* pCreateInfo->fShared; */
+   pArea->fReadonly = HB_FALSE;  /* pCreateInfo->fReadonly */
 
    if( pCreateInfo->cdpId )
    {
@@ -1045,7 +1045,7 @@ static HB_ERRCODE hb_sdfCreate( SDFAREAP pArea, LPDBOPENINFO pCreateInfo )
          fRetry = ( SELF_ERROR( ( AREAP ) pArea, pError ) == E_RETRY );
       }
       else
-         fRetry = FALSE;
+         fRetry = HB_FALSE;
    }
    while( fRetry );
 
@@ -1077,14 +1077,14 @@ static HB_ERRCODE hb_sdfOpen( SDFAREAP pArea, LPDBOPENINFO pOpenInfo )
    PHB_FNAME pFileName;
    HB_ERRCODE errCode;
    USHORT uiFlags;
-   BOOL fRetry;
+   HB_BOOL fRetry;
    char szFileName[ HB_PATH_MAX ];
    char szAlias[ HB_RDD_MAX_ALIAS_LEN + 1 ];
 
    HB_TRACE(HB_TR_DEBUG, ("hb_sdfOpen(%p,%p)", pArea, pOpenInfo));
 
-   pArea->fShared = TRUE;     /* pOpenInfo->fShared; */
-   pArea->fReadonly = TRUE;   /* pOpenInfo->fReadonly; */
+   pArea->fShared = HB_TRUE;     /* pOpenInfo->fShared; */
+   pArea->fReadonly = HB_TRUE;   /* pOpenInfo->fReadonly; */
 
    if( pOpenInfo->cdpId )
    {
@@ -1147,7 +1147,7 @@ static HB_ERRCODE hb_sdfOpen( SDFAREAP pArea, LPDBOPENINFO pOpenInfo )
          fRetry = ( SELF_ERROR( ( AREAP ) pArea, pError ) == E_RETRY );
       }
       else
-         fRetry = FALSE;
+         fRetry = HB_FALSE;
    }
    while( fRetry );
 
@@ -1181,7 +1181,7 @@ static HB_ERRCODE hb_sdfRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnect
    {
       case RDDI_CANPUTREC:
       case RDDI_LOCAL:
-         hb_itemPutL( pItem, TRUE );
+         hb_itemPutL( pItem, HB_TRUE );
          break;
 
       case RDDI_TABLEEXT:

harbour/src/rdd/usrrdd/usrrdd.c

@@ -90,14 +90,14 @@ typedef USRRDDDATA * LPUSRRDDDATA;
 static USHORT s_uiUsrNodes = 0;
 static LPUSRRDDNODE * s_pUsrRddNodes = NULL;
 
-static BOOL hb_usrIsMethod( PHB_ITEM pMethods, USHORT uiMethod )
+static HB_BOOL hb_usrIsMethod( PHB_ITEM pMethods, USHORT uiMethod )
 {
    PHB_ITEM pItem = hb_arrayGetItemPtr( pMethods, uiMethod );
 
    return pItem && ( HB_IS_SYMBOL( pItem ) || HB_IS_BLOCK( pItem ) );
 }
 
-static BOOL hb_usrPushMethod( PHB_ITEM pMethods, USHORT uiMethod )
+static HB_BOOL hb_usrPushMethod( PHB_ITEM pMethods, USHORT uiMethod )
 {
    PHB_ITEM pItem = hb_arrayGetItemPtr( pMethods, uiMethod );
 
@@ -107,16 +107,16 @@ static BOOL hb_usrPushMethod( PHB_ITEM pMethods, USHORT uiMethod )
       {
          hb_vmPush( pItem );
          hb_vmPushNil();
-         return TRUE;
+         return HB_TRUE;
       }
       else if( HB_IS_BLOCK( pItem ) )
       {
          hb_vmPushEvalSym();
          hb_vmPush( pItem );
-         return TRUE;
+         return HB_TRUE;
       }
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static HB_ERRCODE hb_usrReturn( void )
@@ -205,7 +205,7 @@ static PHB_ITEM hb_usrFieldInfoToItem( LPDBFIELDINFO pFieldInfo )
    return pItem;
 }
 
-static BOOL hb_usrItemToFieldInfo( PHB_ITEM pItem, LPDBFIELDINFO pFieldInfo )
+static HB_BOOL hb_usrItemToFieldInfo( PHB_ITEM pItem, LPDBFIELDINFO pFieldInfo )
 {
    if( pItem && hb_arrayLen( pItem ) == UR_FI_SIZE )
    {
@@ -214,9 +214,9 @@ static BOOL hb_usrItemToFieldInfo( PHB_ITEM pItem, LPDBFIELDINFO pFieldInfo )
       pFieldInfo->uiTypeExtended = hb_arrayGetNI( pItem, UR_FI_TYPEEXT );
       pFieldInfo->uiLen          = hb_arrayGetNI( pItem, UR_FI_LEN );
       pFieldInfo->uiDec          = hb_arrayGetNI( pItem, UR_FI_DEC );
-      return TRUE;
+      return HB_TRUE;
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static PHB_ITEM hb_usrOpenInfoToItem( LPDBOPENINFO pOpenInfo )
@@ -240,7 +240,7 @@ static PHB_ITEM hb_usrOpenInfoToItem( LPDBOPENINFO pOpenInfo )
    return pItem;
 }
 
-static BOOL hb_usrItemToOpenInfo( PHB_ITEM pItem, LPDBOPENINFO pOpenInfo )
+static HB_BOOL hb_usrItemToOpenInfo( PHB_ITEM pItem, LPDBOPENINFO pOpenInfo )
 {
    if( pItem && hb_arrayLen( pItem ) == UR_OI_SIZE )
    {
@@ -252,9 +252,9 @@ static BOOL hb_usrItemToOpenInfo( PHB_ITEM pItem, LPDBOPENINFO pOpenInfo )
       pOpenInfo->cdpId        = hb_usrArrayGetC( pItem, UR_OI_CDPID );
       pOpenInfo->ulConnection = hb_arrayGetNL( pItem, UR_OI_CONNECT );
       pOpenInfo->lpdbHeader   = hb_arrayGetPtr( pItem, UR_OI_HEADER );
-      return TRUE;
+      return HB_TRUE;
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static PHB_ITEM hb_usrFilterInfoToItem( LPDBFILTERINFO pFilterInfo )
@@ -273,7 +273,7 @@ static PHB_ITEM hb_usrFilterInfoToItem( LPDBFILTERINFO pFilterInfo )
    return pItem;
 }
 
-static BOOL hb_usrItemToFilterInfo( PHB_ITEM pItem, LPDBFILTERINFO pFilterInfo )
+static HB_BOOL hb_usrItemToFilterInfo( PHB_ITEM pItem, LPDBFILTERINFO pFilterInfo )
 {
    if( pItem && hb_arrayLen( pItem ) == UR_FRI_SIZE )
    {
@@ -282,9 +282,9 @@ static BOOL hb_usrItemToFilterInfo( PHB_ITEM pItem, LPDBFILTERINFO pFilterInfo )
       pFilterInfo->fFilter      = hb_arrayGetL( pItem, UR_FRI_ACTIVE );
       pFilterInfo->fOptimized   = hb_arrayGetL( pItem, UR_FRI_OPTIMIZED );
       pFilterInfo->lpvCargo     = hb_arrayGetPtr( pItem, UR_FRI_CARGO );
-      return TRUE;
+      return HB_TRUE;
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static PHB_ITEM hb_usrRelInfoToItem( LPDBRELINFO pRelInfo )
@@ -305,7 +305,7 @@ static PHB_ITEM hb_usrRelInfoToItem( LPDBRELINFO pRelInfo )
    return pItem;
 }
 
-static BOOL hb_usrItemToRelInfo( PHB_ITEM pItem, LPDBRELINFO pRelInfo )
+static HB_BOOL hb_usrItemToRelInfo( PHB_ITEM pItem, LPDBRELINFO pRelInfo )
 {
    if( pItem && hb_arrayLen( pItem ) == UR_RI_SIZE )
    {
@@ -316,9 +316,9 @@ static BOOL hb_usrItemToRelInfo( PHB_ITEM pItem, LPDBRELINFO pRelInfo )
       pRelInfo->lpaParent   = hb_usrGetAreaPointer( hb_arrayGetNI( pItem, UR_RI_PARENT ) );
       pRelInfo->lpaChild    = hb_usrGetAreaPointer( hb_arrayGetNI( pItem, UR_RI_CHILD ) );
       pRelInfo->lpdbriNext  = ( LPDBRELINFO ) hb_arrayGetPtr( pItem, UR_RI_NEXT );
-      return TRUE;
+      return HB_TRUE;
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static PHB_ITEM hb_usrLockInfoToItem( LPDBLOCKINFO pLockInfo )
@@ -334,16 +334,16 @@ static PHB_ITEM hb_usrLockInfoToItem( LPDBLOCKINFO pLockInfo )
    return pItem;
 }
 
-static BOOL hb_usrItemToLockInfo( PHB_ITEM pItem, LPDBLOCKINFO pLockInfo )
+static HB_BOOL hb_usrItemToLockInfo( PHB_ITEM pItem, LPDBLOCKINFO pLockInfo )
 {
    if( pItem && hb_arrayLen( pItem ) == UR_LI_SIZE )
    {
       pLockInfo->itmRecID = hb_usrArrayGet( pItem, UR_LI_RECORD, HB_IT_ANY );
       pLockInfo->uiMethod = hb_arrayGetNI( pItem, UR_LI_METHOD );
       pLockInfo->fResult  = hb_arrayGetL( pItem, UR_LI_RESULT );
-      return TRUE;
+      return HB_TRUE;
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static PHB_ITEM hb_usrScopeInfoToItem( LPDBSCOPEINFO pScopeInfo )
@@ -375,7 +375,7 @@ static PHB_ITEM hb_usrScopeInfoToItem( LPDBSCOPEINFO pScopeInfo )
    return pItem;
 }
 
-static BOOL hb_usrItemToScopeInfo( PHB_ITEM pItem, LPDBSCOPEINFO pScopeInfo )
+static HB_BOOL hb_usrItemToScopeInfo( PHB_ITEM pItem, LPDBSCOPEINFO pScopeInfo )
 {
    if( pItem && hb_arrayLen( pItem ) == UR_SI_SIZE )
    {
@@ -392,9 +392,9 @@ static BOOL hb_usrItemToScopeInfo( PHB_ITEM pItem, LPDBSCOPEINFO pScopeInfo )
       pScopeInfo->fIgnoreDuplicates = hb_arrayGetL( pItem, UR_SI_IGNOREDUPS );
       pScopeInfo->fBackward         = hb_arrayGetL( pItem, UR_SI_BACKWARD );
       pScopeInfo->fOptimized        = hb_arrayGetL( pItem, UR_SI_OPTIMIZED );
-      return TRUE;
+      return HB_TRUE;
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static PHB_ITEM hb_usrEvalInfoToItem( LPDBEVALINFO pEvalInfo )
@@ -413,7 +413,7 @@ static PHB_ITEM hb_usrEvalInfoToItem( LPDBEVALINFO pEvalInfo )
    return pItem;
 }
 
-static BOOL hb_usrItemToEvalInfo( PHB_ITEM pItem, LPDBEVALINFO pEvalInfo )
+static HB_BOOL hb_usrItemToEvalInfo( PHB_ITEM pItem, LPDBEVALINFO pEvalInfo )
 {
    if( pItem && hb_arrayLen( pItem ) == UR_EI_SIZE )
    {
@@ -422,7 +422,7 @@ static BOOL hb_usrItemToEvalInfo( PHB_ITEM pItem, LPDBEVALINFO pEvalInfo )
       return hb_usrItemToScopeInfo( hb_arrayGetItemPtr( pItem, UR_EI_SCOPE ),
                                     &pEvalInfo->dbsci );
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static PHB_ITEM hb_usrTransInfoToItem( LPDBTRANSINFO pTransInfo )
@@ -456,7 +456,7 @@ static PHB_ITEM hb_usrTransInfoToItem( LPDBTRANSINFO pTransInfo )
    return pItem;
 }
 
-static BOOL hb_usrItemToTransInfo( PHB_ITEM pItem, LPDBTRANSINFO pTransInfo )
+static HB_BOOL hb_usrItemToTransInfo( PHB_ITEM pItem, LPDBTRANSINFO pTransInfo )
 {
    if( pItem && hb_arrayLen( pItem ) == UR_TI_SIZE )
    {
@@ -489,10 +489,10 @@ static BOOL hb_usrItemToTransInfo( PHB_ITEM pItem, LPDBTRANSINFO pTransInfo )
          {
             pTransInfo->lpTransItems = NULL;
          }
-         return TRUE;
+         return HB_TRUE;
       }
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static void hb_usrTransInfoFree( LPDBTRANSINFO pTransInfo )
@@ -529,7 +529,7 @@ static PHB_ITEM hb_usrSortInfoToItem( LPDBSORTINFO pSortInfo )
    return pItem;
 }
 
-static BOOL hb_usrItemToSortInfo( PHB_ITEM pItem, LPDBSORTINFO pSortInfo )
+static HB_BOOL hb_usrItemToSortInfo( PHB_ITEM pItem, LPDBSORTINFO pSortInfo )
 {
    if( pItem && hb_arrayLen( pItem ) == UR_SRI_SIZE )
    {
@@ -559,10 +559,10 @@ static BOOL hb_usrItemToSortInfo( PHB_ITEM pItem, LPDBSORTINFO pSortInfo )
          {
             pSortInfo->lpdbsItem = NULL;
          }
-         return TRUE;
+         return HB_TRUE;
       }
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static void hb_usrSortInfoFree( LPDBSORTINFO pSortInfo )
@@ -592,7 +592,7 @@ static PHB_ITEM hb_usrOrderInfoToItem( LPDBORDERINFO pOrderInfo )
    return pItem;
 }
 
-static BOOL hb_usrItemToOrderInfo( PHB_ITEM pItem, LPDBORDERINFO pOrderInfo )
+static HB_BOOL hb_usrItemToOrderInfo( PHB_ITEM pItem, LPDBORDERINFO pOrderInfo )
 {
    if( pItem && hb_arrayLen( pItem ) == UR_ORI_SIZE )
    {
@@ -602,9 +602,9 @@ static BOOL hb_usrItemToOrderInfo( PHB_ITEM pItem, LPDBORDERINFO pOrderInfo )
       pOrderInfo->itmResult   = hb_usrArrayGet( pItem, UR_ORI_RESULT, HB_IT_ANY );
       pOrderInfo->itmNewVal   = hb_usrArrayGet( pItem, UR_ORI_NEWVAL, HB_IT_ANY );
       pOrderInfo->fAllTags    = hb_arrayGetL( pItem, UR_ORI_ALLTAGS );
-      return TRUE;
+      return HB_TRUE;
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static PHB_ITEM hb_usrOrderCondInfoToItem( LPDBORDERCONDINFO pOrderCondInfo )
@@ -646,8 +646,8 @@ static PHB_ITEM hb_usrOrderCondInfoToItem( LPDBORDERCONDINFO pOrderCondInfo )
    return pItem;
 }
 
-static BOOL hb_usrItemToOrderCondInfo( PHB_ITEM pItem,
-                                       LPDBORDERCONDINFO pOrderCondInfo )
+static HB_BOOL hb_usrItemToOrderCondInfo( PHB_ITEM pItem,
+                                          LPDBORDERCONDINFO pOrderCondInfo )
 {
    if( pItem && hb_arrayLen( pItem ) == UR_ORC_SIZE )
    {
@@ -674,9 +674,9 @@ static BOOL hb_usrItemToOrderCondInfo( PHB_ITEM pItem,
       pOrderCondInfo->fTemporary    = hb_arrayGetL( pItem, UR_ORC_TEMPORARY );
       pOrderCondInfo->fExclusive    = hb_arrayGetL( pItem, UR_ORC_EXCLUSIVE );
       pOrderCondInfo->lpvCargo      = hb_arrayGetPtr( pItem, UR_ORC_CARGO );
-      return TRUE;
+      return HB_TRUE;
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static void hb_usrOrderCondFree( LPDBORDERCONDINFO pOrderCondInfo )
@@ -742,8 +742,8 @@ static PHB_ITEM hb_usrOrderCreateInfoToItem( LPDBORDERCREATEINFO pOrderCreateInf
    return pItem;
 }
 
-static BOOL hb_usrItemToOrderCreateInfo( PHB_ITEM pItem,
-                                         LPDBORDERCREATEINFO pOrderCreateInfo )
+static HB_BOOL hb_usrItemToOrderCreateInfo( PHB_ITEM pItem,
+                                            LPDBORDERCREATEINFO pOrderCreateInfo )
 {
    if( pItem && hb_arrayLen( pItem ) == UR_ORCR_SIZE )
    {
@@ -756,7 +756,7 @@ static BOOL hb_usrItemToOrderCreateInfo( PHB_ITEM pItem,
          if( !hb_usrItemToOrderCondInfo( pCond, pOrderCondInfo ) )
          {
             hb_xfree( pOrderCondInfo );
-            return FALSE;
+            return HB_FALSE;
          }
          pOrderCreateInfo->lpdbOrdCondInfo = pOrderCondInfo;
       }
@@ -772,9 +772,9 @@ static BOOL hb_usrItemToOrderCreateInfo( PHB_ITEM pItem,
       pOrderCreateInfo->itmCobExpr  = hb_usrArrayGet( pItem, UR_ORCR_BKEY, HB_IT_ANY );
       pOrderCreateInfo->abExpr      = hb_usrArrayGet( pItem, UR_ORCR_CKEY, HB_IT_ANY );
 
-      return TRUE;
+      return HB_TRUE;
    }
-   return FALSE;
+   return HB_FALSE;
 }
 
 static void hb_usrOrderCreateFree( LPDBORDERCREATEINFO pOrderCreateInfo )
@@ -951,7 +951,7 @@ static HB_ERRCODE hb_usrRelease( AREAP pArea )
  * Movement and positioning methods
  */
 
-static HB_ERRCODE hb_usrBof( AREAP pArea, BOOL * pBof )
+static HB_ERRCODE hb_usrBof( AREAP pArea, HB_BOOL * pBof )
 {
    LONG lOffset;
 
@@ -978,7 +978,7 @@ static HB_ERRCODE hb_usrBof( AREAP pArea, BOOL * pBof )
    return hb_usrReturn();
 }
 
-static HB_ERRCODE hb_usrEof( AREAP pArea, BOOL * pEof )
+static HB_ERRCODE hb_usrEof( AREAP pArea, HB_BOOL * pEof )
 {
    LONG lOffset;
 
@@ -1005,7 +1005,7 @@ static HB_ERRCODE hb_usrEof( AREAP pArea, BOOL * pEof )
    return hb_usrReturn();
 }
 
-static HB_ERRCODE hb_usrFound( AREAP pArea, BOOL * pFound )
+static HB_ERRCODE hb_usrFound( AREAP pArea, HB_BOOL * pFound )
 {
    LONG lOffset;
 
@@ -1086,7 +1086,7 @@ static HB_ERRCODE hb_usrGoToId( AREAP pArea, PHB_ITEM pRecNo )
    return hb_usrReturn();
 }
 
-static HB_ERRCODE hb_usrSeek( AREAP pArea, BOOL fSoftSeek, PHB_ITEM pItem, BOOL fFindLast )
+static HB_ERRCODE hb_usrSeek( AREAP pArea, HB_BOOL fSoftSeek, PHB_ITEM pItem, HB_BOOL fFindLast )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_usrSeek(%p,%d,%p,%d)", pArea, fSoftSeek, pItem, fFindLast));
 
@@ -1149,14 +1149,14 @@ static HB_ERRCODE hb_usrSkipRaw( AREAP pArea, LONG lRecords )
  * Data management
  */
 
-static HB_ERRCODE hb_usrDeleted( AREAP pArea, BOOL * pDeleted )
+static HB_ERRCODE hb_usrDeleted( AREAP pArea, HB_BOOL * pDeleted )
 {
    LONG lOffset;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_usrDeleted(%p, %p)", pArea, pDeleted));
 
    lOffset = hb_stackTopOffset() - hb_stackBaseOffset();
-   hb_vmPushLogical( FALSE );
+   hb_vmPushLogical( HB_FALSE );
    if( !hb_usrPushMethod( SELF_USRNODE( pArea )->pMethods, UR_DELETED ) )
    {
       hb_stackPop();
@@ -1239,7 +1239,7 @@ static HB_ERRCODE hb_usrFieldName( AREAP pArea, USHORT uiIndex, char * szName )
    return hb_usrReturn();
 }
 
-static HB_ERRCODE hb_usrAppend( AREAP pArea, BOOL fUnLockAll )
+static HB_ERRCODE hb_usrAppend( AREAP pArea, HB_BOOL fUnLockAll )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_usrAppend(%p, %d)", pArea, fUnLockAll));
 
@@ -1690,14 +1690,14 @@ static HB_ERRCODE hb_usrPack( AREAP pArea )
    return hb_usrReturn();
 }
 
-static HB_ERRCODE hb_usrPackRec( AREAP pArea, ULONG ulRecNo, BOOL * pWritten )
+static HB_ERRCODE hb_usrPackRec( AREAP pArea, ULONG ulRecNo, HB_BOOL * pWritten )
 {
    LONG lOffset;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_usrPackRec(%p,%lu,%p)", pArea, ulRecNo, pWritten));
 
    lOffset = hb_stackTopOffset() - hb_stackBaseOffset();
-   hb_vmPushLogical( TRUE );
+   hb_vmPushLogical( HB_TRUE );
    if( !hb_usrPushMethod( SELF_USRNODE( pArea )->pMethods, UR_PACKREC ) )
    {
       hb_stackPop();
@@ -2278,7 +2278,7 @@ static HB_ERRCODE hb_usrSetLocate( AREAP pArea, LPDBSCOPEINFO pScopeInfo )
    return hb_usrReturn();
 }
 
-static HB_ERRCODE hb_usrLocate( AREAP pArea, BOOL fContinue )
+static HB_ERRCODE hb_usrLocate( AREAP pArea, HB_BOOL fContinue )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_usrLocate(%p,%d)", pArea, fContinue));
 
@@ -3133,7 +3133,7 @@ HB_FUNC_UR_SUPER( BOF )
 
    if( pArea )
    {
-      BOOL fBof;
+      HB_BOOL fBof;
 
       hb_retni( SUPER_BOF( pArea, &fBof ) );
       hb_storl( fBof, 2 );
@@ -3146,7 +3146,7 @@ HB_FUNC_UR_SUPER( EOF )
 
    if( pArea )
    {
-      BOOL fEof;
+      HB_BOOL fEof;
 
       hb_retni( SUPER_EOF( pArea, &fEof ) );
       hb_storl( fEof, 2 );
@@ -3159,7 +3159,7 @@ HB_FUNC_UR_SUPER( FOUND )
 
    if( pArea )
    {
-      BOOL fFound;
+      HB_BOOL fFound;
 
       hb_retni( SUPER_FOUND( pArea, &fFound ) );
       hb_storl( fFound, 2 );
@@ -3237,7 +3237,7 @@ HB_FUNC_UR_SUPER( DELETED )
 
    if( pArea )
    {
-      BOOL fDeleted;
+      HB_BOOL fDeleted;
 
       hb_retni( SUPER_DELETED( pArea, &fDeleted ) );
       hb_storl( fDeleted, 2 );
@@ -3594,7 +3594,7 @@ HB_FUNC_UR_SUPER( PACKREC )
 
    if( pArea )
    {
-      BOOL fWritten;
+      HB_BOOL fWritten;
 
       hb_retni( SUPER_PACKREC( pArea, hb_parnl( 2 ), &fWritten ) );
       hb_storl( fWritten, 3 );

harbour/src/rdd/wacore.c

@@ -259,13 +259,13 @@ void hb_rddCloseAll( void )
    pRddInfo = hb_stackRDD();
    if( pRddInfo->uiWaMax > 0 )
    {
-      BOOL isParents, isFinish = FALSE;
+      HB_BOOL isParents, isFinish = HB_FALSE;
       AREAP pArea;
       USHORT uiIndex;
 
       do
       {
-         isParents = FALSE;
+         isParents = HB_FALSE;
          for( uiIndex = 1; uiIndex < pRddInfo->uiWaMax; uiIndex++ )
          {
             pArea = ( AREAP ) pRddInfo->waList[ uiIndex ];
@@ -278,7 +278,7 @@ void hb_rddCloseAll( void )
             }
             else if( pArea->uiParents )
             {
-               isParents = TRUE;
+               isParents = HB_TRUE;
             }
             else
             {
@@ -287,7 +287,7 @@ void hb_rddCloseAll( void )
          }
          if( !isParents && !isFinish )
          {
-            isParents = isFinish = TRUE;
+            isParents = isFinish = HB_TRUE;
          }
       }
       while( isParents );
@@ -352,12 +352,12 @@ HB_ERRCODE hb_rddIterateWorkAreas( WACALLBACK pCallBack, void * cargo )
    return errCode;
 }
 
-BOOL hb_rddGetNetErr( void )
+HB_BOOL hb_rddGetNetErr( void )
 {
    return hb_stackRDD()->fNetError;
 }
 
-void hb_rddSetNetErr( BOOL fNetErr )
+void hb_rddSetNetErr( HB_BOOL fNetErr )
 {
    hb_stackRDD()->fNetError = fNetErr;
 }
@@ -574,7 +574,7 @@ HB_ERRCODE hb_rddDetachArea( AREAP pArea, PHB_ITEM pCargo )
 }
 
 AREAP hb_rddRequestArea( const char * szAlias, PHB_ITEM pCargo,
-                         BOOL fNewArea, BOOL fWait )
+                         HB_BOOL fNewArea, HB_BOOL fWait )
 {
    PHB_DYNS pSymAlias = NULL;
    AREAP pArea = NULL;

harbour/src/rdd/wafunc.c

@@ -308,7 +308,7 @@ USHORT hb_rddFieldExpIndex( AREAP pArea, const char * szField )
  */
 HB_ERRCODE hb_rddGetAliasNumber( const char * szAlias, int * iArea )
 {
-   BOOL fOneLetter;
+   HB_BOOL fOneLetter;
    char c;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_rddGetAliasNumber(%s, %p)", szAlias, iArea));
@@ -585,7 +585,7 @@ HB_ERRCODE hb_rddPutFieldValue( HB_ITEM_PTR pItem, PHB_SYMB pFieldSymbol )
 
 HB_ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver,
                             USHORT uiArea, const char *szAlias,
-                            BOOL fShared, BOOL fReadonly,
+                            HB_BOOL fShared, HB_BOOL fReadonly,
                             const char * szCpId, ULONG ulConnection,
                             PHB_ITEM pStruct, PHB_ITEM pDelim )
 {
@@ -611,7 +611,7 @@ HB_ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver,
 
    /* Clipper clears NETERR flag before parameter validation, [druzus]
     */
-   hb_rddSetNetErr( FALSE );
+   hb_rddSetNetErr( HB_FALSE );
 
    /* Now check parameters, first RDD name.
     * Clipper seems to make sth like:
@@ -673,7 +673,7 @@ HB_ERRCODE hb_rddOpenTable( const char * szFileName, const char * szDriver,
 
 HB_ERRCODE hb_rddCreateTable( const char * szFileName, const char * szDriver,
                               USHORT uiArea, const char *szAlias,
-                              BOOL fKeepOpen,
+                              HB_BOOL fKeepOpen,
                               const char * szCpId, ULONG ulConnection,
                               PHB_ITEM pStruct, PHB_ITEM pDelim )
 {
@@ -717,8 +717,8 @@ HB_ERRCODE hb_rddCreateTable( const char * szFileName, const char * szDriver,
    pInfo.uiArea = pArea->uiArea;
    pInfo.abName = szFileName;
    pInfo.atomAlias = szAlias;
-   pInfo.fShared = FALSE;
-   pInfo.fReadonly = FALSE;
+   pInfo.fShared = HB_FALSE;
+   pInfo.fReadonly = HB_FALSE;
    pInfo.cdpId = szCpId ? szCpId : hb_setGetDBCODEPAGE();
    pInfo.ulConnection = ulConnection;
    pInfo.lpdbHeader = NULL;
@@ -782,13 +782,13 @@ HB_ERRCODE hb_rddCreateTableTemp( const char * szDriver,
    pInfo.uiArea = pArea->uiArea;
    pInfo.abName = NULL;
    pInfo.atomAlias = szAlias;
-   pInfo.fShared = FALSE;
-   pInfo.fReadonly = FALSE;
+   pInfo.fShared = HB_FALSE;
+   pInfo.fReadonly = HB_FALSE;
    pInfo.cdpId = szCpId ? szCpId : hb_setGetDBCODEPAGE();
    pInfo.ulConnection = ulConnection;
    pInfo.lpdbHeader = NULL;
 
-   pItem = hb_itemPutL( NULL, TRUE );
+   pItem = hb_itemPutL( NULL, HB_TRUE );
    errCode = SELF_INFO( pArea, DBI_ISTEMPORARY, pItem );
    hb_itemRelease( pItem );
 
@@ -876,7 +876,7 @@ HB_ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest,
    USHORT uiFields, uiSize, uiCount, uiPosSrc, uiPosDst, uiSizeSrc, uiSizeDst;
    HB_ERRCODE errCode;
    const char * szField;
-   BOOL fAll;
+   HB_BOOL fAll;
 
    errCode = SELF_FIELDCOUNT( lpaSource, &uiSizeSrc );
    if( errCode != HB_SUCCESS )
@@ -934,7 +934,7 @@ HB_ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest,
             szField = hb_itemGetCPtr( pItem );
             uiPosDst = hb_rddFieldExpIndex( lpaDest, szField );
             if( uiPosDst != uiCount )
-               fAll = FALSE;
+               fAll = HB_FALSE;
             if( uiPosDst )
             {
                USHORT ui;
@@ -983,7 +983,7 @@ HB_ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest,
             if( uiPosDst )
             {
                if( uiPosSrc != uiPosDst )
-                  fAll = FALSE;
+                  fAll = HB_FALSE;
                lpdbTransInfo->lpTransItems[ uiSize ].uiSource = uiPosSrc;
                lpdbTransInfo->lpTransItems[ uiSize++ ].uiDest = uiPosDst;
                if( !lpaDest )
@@ -998,14 +998,14 @@ HB_ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest,
    }
 
    if( uiSize != uiSizeSrc )
-      fAll = FALSE;
+      fAll = HB_FALSE;
 
    if( fAll && lpaDest )
    {
       PHB_ITEM pSrcItm = hb_itemNew( NULL ),
                pDstItm = hb_itemNew( NULL );
       /*
-       * if fAll is TRUE here then it means that all fields are included
+       * if fAll is HB_TRUE here then it means that all fields are included
        * and they are on the same positions in both tables, so now check
        * if their types and sizes are also equal
        */
@@ -1020,7 +1020,7 @@ HB_ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest,
          if( hb_stricmp( hb_itemGetCPtr( pSrcItm ),
                          hb_itemGetCPtr( pDstItm ) ) != 0 )
          {
-            fAll = FALSE;
+            fAll = HB_FALSE;
             break;
          }
          if( SELF_FIELDINFO( lpaSource, uiCount, DBS_LEN, pSrcItm ) != HB_SUCCESS ||
@@ -1031,7 +1031,7 @@ HB_ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest,
          }
          if( hb_itemGetNL( pSrcItm ) != hb_itemGetNL( pDstItm ) )
          {
-            fAll = FALSE;
+            fAll = HB_FALSE;
             break;
          }
          if( SELF_FIELDINFO( lpaSource, uiCount, DBS_DEC, pSrcItm ) != HB_SUCCESS ||
@@ -1042,7 +1042,7 @@ HB_ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest,
          }
          if( hb_itemGetNL( pSrcItm ) != hb_itemGetNL( pDstItm ) )
          {
-            fAll = FALSE;
+            fAll = HB_FALSE;
             break;
          }
 #ifdef DBS_FLAG
@@ -1055,7 +1055,7 @@ HB_ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest,
 #endif
          if( hb_itemGetNL( pSrcItm ) != hb_itemGetNL( pDstItm ) )
          {
-            fAll = FALSE;
+            fAll = HB_FALSE;
             break;
          }
       }
@@ -1070,15 +1070,15 @@ HB_ERRCODE hb_dbTransStruct( AREAP lpaSource, AREAP lpaDest,
 }
 
 HB_ERRCODE hb_rddTransRecords( AREAP pArea,
-                            const char *szFileName, const char *szDriver,
-                            ULONG ulConnection,
-                            PHB_ITEM pFields, BOOL fExport,
-                            PHB_ITEM pCobFor, PHB_ITEM pStrFor,
-                            PHB_ITEM pCobWhile, PHB_ITEM pStrWhile,
-                            PHB_ITEM pNext, PHB_ITEM pRecID,
-                            PHB_ITEM pRest,
-                            const char *szCpId,
-                            PHB_ITEM pDelim )
+                               const char *szFileName, const char *szDriver,
+                               ULONG ulConnection,
+                               PHB_ITEM pFields, HB_BOOL fExport,
+                               PHB_ITEM pCobFor, PHB_ITEM pStrFor,
+                               PHB_ITEM pCobWhile, PHB_ITEM pStrWhile,
+                               PHB_ITEM pNext, PHB_ITEM pRecID,
+                               PHB_ITEM pRest,
+                               const char *szCpId,
+                               PHB_ITEM pDelim )
 {
    AREAP lpaClose = NULL;
    PHB_ITEM pStruct = NULL;
@@ -1100,7 +1100,7 @@ HB_ERRCODE hb_rddTransRecords( AREAP pArea,
       if( errCode == HB_SUCCESS )
       {
          errCode = hb_rddCreateTable( szFileName, szDriver, 0, "",
-                                      TRUE,
+                                      HB_TRUE,
                                       szCpId, ulConnection, pStruct, pDelim );
          if( errCode == HB_SUCCESS )
          {
@@ -1136,7 +1136,7 @@ HB_ERRCODE hb_rddTransRecords( AREAP pArea,
 
          if( errCode == HB_SUCCESS )
          {
-            errCode = hb_rddOpenTable( szFileName, szDriver, 0, "", TRUE, TRUE,
+            errCode = hb_rddOpenTable( szFileName, szDriver, 0, "", HB_TRUE, HB_TRUE,
                                        szCpId, ulConnection, pStruct, pDelim );
             if( errCode == HB_SUCCESS )
             {
@@ -1147,7 +1147,7 @@ HB_ERRCODE hb_rddTransRecords( AREAP pArea,
       }
       else
       {
-         errCode = hb_rddOpenTable( szFileName, szDriver, 0, "", TRUE, TRUE,
+         errCode = hb_rddOpenTable( szFileName, szDriver, 0, "", HB_TRUE, HB_TRUE,
                                     szCpId, ulConnection, NULL, pDelim );
          if( errCode == HB_SUCCESS )
          {
@@ -1173,11 +1173,11 @@ HB_ERRCODE hb_rddTransRecords( AREAP pArea,
       dbTransInfo.dbsci.itmRecID    = pRecID;
       dbTransInfo.dbsci.fRest       = pRest;
 
-      dbTransInfo.dbsci.fIgnoreFilter     = TRUE;
-      dbTransInfo.dbsci.fIncludeDeleted   = TRUE;
-      dbTransInfo.dbsci.fLast             = FALSE;
-      dbTransInfo.dbsci.fIgnoreDuplicates = FALSE;
-      dbTransInfo.dbsci.fBackward         = FALSE;
+      dbTransInfo.dbsci.fIgnoreFilter     = HB_TRUE;
+      dbTransInfo.dbsci.fIncludeDeleted   = HB_TRUE;
+      dbTransInfo.dbsci.fLast             = HB_FALSE;
+      dbTransInfo.dbsci.fIgnoreDuplicates = HB_FALSE;
+      dbTransInfo.dbsci.fBackward         = HB_FALSE;
 
       errCode = SELF_TRANS( dbTransInfo.lpaSource, &dbTransInfo );
    }

harbour/src/rdd/workarea.c

@@ -72,7 +72,7 @@
 /*
  * Determine logical beginning of file.
  */
-static HB_ERRCODE hb_waBof( AREAP pArea, BOOL * pBof )
+static HB_ERRCODE hb_waBof( AREAP pArea, HB_BOOL * pBof )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_waBof(%p, %p)", pArea, pBof));
 
@@ -83,7 +83,7 @@ static HB_ERRCODE hb_waBof( AREAP pArea, BOOL * pBof )
 /*
  * Determine logical end of file.
  */
-static HB_ERRCODE hb_waEof( AREAP pArea, BOOL * pEof )
+static HB_ERRCODE hb_waEof( AREAP pArea, HB_BOOL * pEof )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_waEof(%p, %p)", pArea, pEof));
 
@@ -94,7 +94,7 @@ static HB_ERRCODE hb_waEof( AREAP pArea, BOOL * pEof )
 /*
  * Determine outcome of the last search operation.
  */
-static HB_ERRCODE hb_waFound( AREAP pArea, BOOL * pFound )
+static HB_ERRCODE hb_waFound( AREAP pArea, HB_BOOL * pFound )
 {
    HB_TRACE(HB_TR_DEBUG, ("hb_waFound(%p, %p)", pArea, pFound));
 
@@ -115,7 +115,7 @@ static HB_ERRCODE hb_waSkip( AREAP pArea, LONG lToSkip )
    if( lToSkip == 0 )
       return SELF_SKIPRAW( pArea, 0 );
 
-   pArea->fTop = pArea->fBottom = FALSE;
+   pArea->fTop = pArea->fBottom = HB_FALSE;
 
    if( lToSkip > 0 )
       lSkip = 1;
@@ -136,9 +136,9 @@ static HB_ERRCODE hb_waSkip( AREAP pArea, LONG lToSkip )
 
    /* Update Bof and Eof flags */
    if( lSkip < 0 )
-      pArea->fEof = FALSE;
+      pArea->fEof = HB_FALSE;
    else /* ( lSkip > 0 ) */
-      pArea->fBof = FALSE;
+      pArea->fBof = HB_FALSE;
 
    return HB_SUCCESS;
 }
@@ -148,7 +148,7 @@ static HB_ERRCODE hb_waSkip( AREAP pArea, LONG lToSkip )
  */
 static HB_ERRCODE hb_waSkipFilter( AREAP pArea, LONG lUpDown )
 {
-   BOOL fBottom, fDeleted;
+   HB_BOOL fBottom, fDeleted;
    HB_ERRCODE errCode;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_waSkipFilter(%p, %ld)", pArea, lUpDown));
@@ -222,7 +222,7 @@ static HB_ERRCODE hb_waSkipFilter( AREAP pArea, LONG lUpDown )
       else
       {
          errCode = SELF_GOTOP( pArea );
-         pArea->fBof = TRUE;
+         pArea->fBof = HB_TRUE;
       }
    }
    else
@@ -689,7 +689,7 @@ static HB_ERRCODE hb_waInfo( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
       case DBI_CANPUTREC:
       case DBI_ISFLOCK:
       case DBI_SHARED:
-         hb_itemPutL( pItem, FALSE );
+         hb_itemPutL( pItem, HB_FALSE );
          break;
 
       /*
@@ -769,7 +769,7 @@ static HB_ERRCODE hb_waInfo( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
       case DBI_SCOPEDRELATION:
       {
          int iRelNo = hb_itemGetNI( pItem );
-         BOOL fScoped = FALSE;
+         HB_BOOL fScoped = HB_FALSE;
 
          if( iRelNo > 0 )
          {
@@ -793,7 +793,7 @@ static HB_ERRCODE hb_waInfo( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
          if( SELF_RECNO( pArea, &ulRecNo ) != HB_SUCCESS )
             return HB_FAILURE;
          if( ulRecNo == 0 )
-            hb_itemPutL( pItem, FALSE );
+            hb_itemPutL( pItem, HB_FALSE );
          else if( SELF_RECCOUNT( pArea, &ulRecCount ) != HB_SUCCESS )
             return HB_FAILURE;
          else
@@ -801,7 +801,7 @@ static HB_ERRCODE hb_waInfo( AREAP pArea, USHORT uiIndex, PHB_ITEM pItem )
          break;
       }
       case DBI_RM_SUPPORTED:
-         hb_itemPutL( pItem, FALSE );
+         hb_itemPutL( pItem, HB_FALSE );
          break;
 
       case DBI_DB_VERSION:
@@ -959,7 +959,7 @@ static HB_ERRCODE hb_waSysName( AREAP pArea, char * pBuffer )
 static HB_ERRCODE hb_waEval( AREAP pArea, LPDBEVALINFO pEvalInfo )
 {
    LONG lNext = 1;
-   BOOL fEof, fFor;
+   HB_BOOL fEof, fFor;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_waEval(%p, %p)", pArea, pEvalInfo));
 
@@ -1006,7 +1006,7 @@ static HB_ERRCODE hb_waEval( AREAP pArea, LPDBEVALINFO pEvalInfo )
             fFor = hb_itemGetL( pArea->valResult );
          }
          else
-            fFor = TRUE;
+            fFor = HB_TRUE;
 
          if( fFor )
          {
@@ -1028,10 +1028,10 @@ static HB_ERRCODE hb_waEval( AREAP pArea, LPDBEVALINFO pEvalInfo )
 /*
  * Locate a record which pass given condition
  */
-static HB_ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue )
+static HB_ERRCODE hb_waLocate( AREAP pArea, HB_BOOL fContinue )
 {
    LONG lNext = 1;
-   BOOL fEof;
+   HB_BOOL fEof;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_waLocate(%p, %d)", pArea, fContinue));
 
@@ -1059,7 +1059,7 @@ static HB_ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue )
          return HB_FAILURE;
    }
 
-   pArea->fFound = FALSE;
+   pArea->fFound = HB_FALSE;
 
    /* TODO: use SKIPSCOPE() method and fRest parameter */
 
@@ -1083,7 +1083,7 @@ static HB_ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue )
 
          if( ! pArea->dbsi.itmCobFor )
          {
-            pArea->fFound = TRUE;
+            pArea->fFound = HB_TRUE;
             break;
          }
          else
@@ -1093,7 +1093,7 @@ static HB_ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue )
 
             if( hb_itemGetL( pArea->valResult ) )
             {
-               pArea->fFound = TRUE;
+               pArea->fFound = HB_TRUE;
                break;
             }
          }
@@ -1116,7 +1116,7 @@ static HB_ERRCODE hb_waLocate( AREAP pArea, BOOL fContinue )
 static HB_ERRCODE hb_waTrans( AREAP pArea, LPDBTRANSINFO pTransInfo )
 {
    LONG lNext = 1;
-   BOOL fEof, fFor;
+   HB_BOOL fEof, fFor;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_waTrans(%p, %p)", pArea, pTransInfo));
 
@@ -1163,7 +1163,7 @@ static HB_ERRCODE hb_waTrans( AREAP pArea, LPDBTRANSINFO pTransInfo )
             fFor = hb_itemGetL( pArea->valResult );
          }
          else
-            fFor = TRUE;
+            fFor = HB_TRUE;
 
          if( fFor )
          {
@@ -1187,7 +1187,7 @@ static HB_ERRCODE hb_waTrans( AREAP pArea, LPDBTRANSINFO pTransInfo )
  */
 static HB_ERRCODE hb_waTransRec( AREAP pArea, LPDBTRANSINFO pTransInfo )
 {
-   BOOL bDeleted;
+   HB_BOOL bDeleted;
    BYTE *pRecord;
    HB_ERRCODE errCode;
 
@@ -1205,7 +1205,7 @@ static HB_ERRCODE hb_waTransRec( AREAP pArea, LPDBTRANSINFO pTransInfo )
          return errCode;
 
       /* Append a new record */
-      errCode = SELF_APPEND( ( AREAP ) pTransInfo->lpaDest, TRUE );
+      errCode = SELF_APPEND( ( AREAP ) pTransInfo->lpaDest, HB_TRUE );
       if( errCode != HB_SUCCESS )
          return errCode;
 
@@ -1219,7 +1219,7 @@ static HB_ERRCODE hb_waTransRec( AREAP pArea, LPDBTRANSINFO pTransInfo )
       USHORT uiCount;
 
       /* Append a new record */
-      errCode = SELF_APPEND( ( AREAP ) pTransInfo->lpaDest, TRUE );
+      errCode = SELF_APPEND( ( AREAP ) pTransInfo->lpaDest, HB_TRUE );
       if( errCode != HB_SUCCESS )
          return errCode;
 
@@ -1380,7 +1380,7 @@ static HB_ERRCODE hb_waRelEval( AREAP pArea, LPDBRELINFO pRelInfo )
    DBORDERINFO pInfo;
    HB_ERRCODE errCode;
    int iOrder;
-   BOOL fEof;
+   HB_BOOL fEof;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_waRelEval(%p, %p)", pArea, pRelInfo));
 
@@ -1416,7 +1416,7 @@ static HB_ERRCODE hb_waRelEval( AREAP pArea, LPDBRELINFO pRelInfo )
                         errCode = SELF_ORDINFO( pArea, DBOI_SCOPEBOTTOM, &pInfo );
                   }
                   if( errCode == HB_SUCCESS )
-                     errCode = SELF_SEEK( pArea, FALSE, pResult, FALSE );
+                     errCode = SELF_SEEK( pArea, HB_FALSE, pResult, HB_FALSE );
                }
                else
                {
@@ -1518,8 +1518,8 @@ static HB_ERRCODE hb_waClearFilter( AREAP pArea )
       hb_itemRelease( pArea->dbfi.abFilterText );
       pArea->dbfi.abFilterText = NULL;
    }
-   pArea->dbfi.fOptimized = FALSE;
-   pArea->dbfi.fFilter = FALSE;
+   pArea->dbfi.fOptimized = HB_FALSE;
+   pArea->dbfi.fFilter = HB_FALSE;
 
    return HB_SUCCESS;
 }
@@ -1604,7 +1604,7 @@ static HB_ERRCODE hb_waSetFilter( AREAP pArea, LPDBFILTERINFO pFilterInfo )
       pArea->dbfi.abFilterText = hb_itemNew( pFilterInfo->abFilterText );
    }
    pArea->dbfi.fOptimized = pFilterInfo->fOptimized;
-   pArea->dbfi.fFilter = TRUE;
+   pArea->dbfi.fFilter = HB_TRUE;
 
    return HB_SUCCESS;
 }
@@ -1722,7 +1722,7 @@ static HB_ERRCODE hb_waEvalBlock( AREAP pArea, PHB_ITEM pBlock )
  */
 static HB_ERRCODE hb_waRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnection, PHB_ITEM pItem )
 {
-   BOOL fResult;
+   HB_BOOL fResult;
    int iResult;
 
    HB_TRACE(HB_TR_DEBUG, ("hb_rddInfo(%p, %hu, %lu, %p)", pRDD, uiIndex, ulConnection, pItem));
@@ -1745,7 +1745,7 @@ static HB_ERRCODE hb_waRddInfo( LPRDDNODE pRDD, USHORT uiIndex, ULONG ulConnecti
       case RDDI_SORTRECNO:
       case RDDI_MULTIKEY:
       case RDDI_BLOB_SUPPORT:
-         hb_itemPutL( pItem, FALSE );
+         hb_itemPutL( pItem, HB_FALSE );
          break;
 
       case RDDI_CONNECTION: