From 32f59a1f705dcb9667a69d37ccffd7e26add6355 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 8 Feb 2010 18:54:32 +0000 Subject: [PATCH] 2010-02-08 19:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/vm/macro.c * src/vm/runner.c * src/vm/estack.c * src/vm/codebloc.c * src/vm/debug.c * src/vm/hvm.c * src/vm/pvalue.c * src/vm/arrays.c * src/vm/memvars.c * src/vm/eval.c * src/vm/classes.c * src/common/hbffind.c * src/rdd/dbfntx/dbfntx1.c * src/rdd/workarea.c * src/rdd/sdf1.c * src/rdd/dbcmdx.c * src/rdd/dbfnsx/dbfnsx1.c * src/rdd/dbcmd.c * src/rdd/dbfcdx/dbfcdx1.c * src/rdd/delim1.c * src/rdd/dbf1.c * src/rdd/usrrdd/usrrdd.c * src/rdd/dbffpt/dbffpt1.c * src/rdd/hbsix/sxord.c * src/compiler/hbmain.c * src/compiler/hbpcode.c * src/compiler/genc.c * src/compiler/hbopt.c * src/compiler/gencc.c * src/compiler/hblbl.c * tests/bldtest/bldtest.c * include/hbstack.h * include/hbapifs.h * include/hbxvm.h * include/hbdefs.h * include/hbmacro.h * include/hbapi.h * include/hbcomp.h * include/hbapirdd.h * include/hbsxfunc.h * include/hbrddcdx.h * include/hbexprb.c * contrib/hbct/maxline.c * contrib/hbct/numcount.c * contrib/hbct/addascii.c * contrib/xhb/xhbenum.c * contrib/xhb/xhbqself.c * contrib/xhb/xhbwith.c * contrib/xhb/hbcomprs.c * contrib/xhb/xhbmsgs.c * contrib/hbmzip/hbmzip.c * contrib/xpp/dbcmdx.c * contrib/hbnetio/netiocli.c * contrib/rddsql/sqlbase.c * contrib/rddsql/sqlmix.c * contrib/rddads/adsx.c * contrib/rddads/ads1.c * contrib/hbbmcdx/bmdbfcdx.c * contrib/hbbmcdx/hbbmcdx.h * contrib/hbbtree/hb_btree.h * contrib/hbbtree/hb_btree.c * LONG -> HB_LONG, long (for dates and extend / item API contexts) (except for external (OS) API specific usage) * src/vm/maindll.c * LONG -> void * + Added 'const' to char * parameter. * contrib/hbct/numline.c * contrib/hbct/ctpad.c * LONG -> HB_LONG, HB_ISIZ * Formatting. * contrib/xhb/hbxml.h * LONG -> HB_ISIZ * contrib/xhb/freadlin.c * LONG, int -> HB_ISIZ --- harbour/ChangeLog | 80 ++++++++++++++++++++++++++++ harbour/contrib/hbbmcdx/bmdbfcdx.c | 28 +++++----- harbour/contrib/hbbmcdx/hbbmcdx.h | 10 ++-- harbour/contrib/hbbtree/hb_btree.c | 42 +++++++-------- harbour/contrib/hbbtree/hb_btree.h | 6 +-- harbour/contrib/hbct/addascii.c | 8 +-- harbour/contrib/hbct/ctpad.c | 2 +- harbour/contrib/hbct/maxline.c | 6 +-- harbour/contrib/hbct/numcount.c | 2 +- harbour/contrib/hbct/numline.c | 16 +++--- harbour/contrib/hbmzip/hbmzip.c | 2 +- harbour/contrib/hbnetio/netiocli.c | 2 +- harbour/contrib/rddads/ads1.c | 18 +++---- harbour/contrib/rddads/adsx.c | 4 +- harbour/contrib/rddsql/sqlbase.c | 4 +- harbour/contrib/rddsql/sqlmix.c | 12 ++--- harbour/contrib/xhb/freadlin.c | 20 +++---- harbour/contrib/xhb/hbcomprs.c | 2 +- harbour/contrib/xhb/hbxml.h | 4 +- harbour/contrib/xhb/xhbenum.c | 2 +- harbour/contrib/xhb/xhbmsgs.c | 2 +- harbour/contrib/xhb/xhbqself.c | 2 +- harbour/contrib/xhb/xhbwith.c | 12 ++--- harbour/contrib/xpp/dbcmdx.c | 4 +- harbour/include/hbapi.h | 12 ++--- harbour/include/hbapifs.h | 2 +- harbour/include/hbapirdd.h | 12 ++--- harbour/include/hbcomp.h | 8 +-- harbour/include/hbdefs.h | 8 +-- harbour/include/hbexprb.c | 18 +++---- harbour/include/hbmacro.h | 6 +-- harbour/include/hbrddcdx.h | 2 +- harbour/include/hbstack.h | 24 ++++----- harbour/include/hbsxfunc.h | 4 +- harbour/include/hbxvm.h | 34 ++++++------ harbour/src/common/hbffind.c | 2 +- harbour/src/compiler/genc.c | 44 ++++++++-------- harbour/src/compiler/gencc.c | 28 +++++----- harbour/src/compiler/hblbl.c | 2 +- harbour/src/compiler/hbmain.c | 18 +++---- harbour/src/compiler/hbopt.c | 14 ++--- harbour/src/compiler/hbpcode.c | 2 +- harbour/src/rdd/dbcmd.c | 2 +- harbour/src/rdd/dbcmdx.c | 4 +- harbour/src/rdd/dbf1.c | 4 +- harbour/src/rdd/dbfcdx/dbfcdx1.c | 26 ++++----- harbour/src/rdd/dbffpt/dbffpt1.c | 34 ++++++------ harbour/src/rdd/dbfnsx/dbfnsx1.c | 20 +++---- harbour/src/rdd/dbfntx/dbfntx1.c | 20 +++---- harbour/src/rdd/delim1.c | 2 +- harbour/src/rdd/hbsix/sxord.c | 2 +- harbour/src/rdd/sdf1.c | 2 +- harbour/src/rdd/usrrdd/usrrdd.c | 34 ++++++------ harbour/src/rdd/workarea.c | 22 ++++---- harbour/src/vm/arrays.c | 2 +- harbour/src/vm/classes.c | 26 ++++----- harbour/src/vm/codebloc.c | 4 +- harbour/src/vm/debug.c | 10 ++-- harbour/src/vm/estack.c | 32 ++++++------ harbour/src/vm/eval.c | 4 +- harbour/src/vm/hvm.c | 84 +++++++++++++++--------------- harbour/src/vm/macro.c | 8 +-- harbour/src/vm/maindll.c | 6 +-- harbour/src/vm/memvars.c | 2 +- harbour/src/vm/pvalue.c | 2 +- harbour/src/vm/runner.c | 2 +- harbour/tests/bldtest/bldtest.c | 4 +- 67 files changed, 481 insertions(+), 407 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5ab3acc94c..2ebac75c2e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,86 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-02-08 19:52 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * src/vm/macro.c + * src/vm/runner.c + * src/vm/estack.c + * src/vm/codebloc.c + * src/vm/debug.c + * src/vm/hvm.c + * src/vm/pvalue.c + * src/vm/arrays.c + * src/vm/memvars.c + * src/vm/eval.c + * src/vm/classes.c + * src/common/hbffind.c + * src/rdd/dbfntx/dbfntx1.c + * src/rdd/workarea.c + * src/rdd/sdf1.c + * src/rdd/dbcmdx.c + * src/rdd/dbfnsx/dbfnsx1.c + * src/rdd/dbcmd.c + * src/rdd/dbfcdx/dbfcdx1.c + * src/rdd/delim1.c + * src/rdd/dbf1.c + * src/rdd/usrrdd/usrrdd.c + * src/rdd/dbffpt/dbffpt1.c + * src/rdd/hbsix/sxord.c + * src/compiler/hbmain.c + * src/compiler/hbpcode.c + * src/compiler/genc.c + * src/compiler/hbopt.c + * src/compiler/gencc.c + * src/compiler/hblbl.c + * tests/bldtest/bldtest.c + * include/hbstack.h + * include/hbapifs.h + * include/hbxvm.h + * include/hbdefs.h + * include/hbmacro.h + * include/hbapi.h + * include/hbcomp.h + * include/hbapirdd.h + * include/hbsxfunc.h + * include/hbrddcdx.h + * include/hbexprb.c + * contrib/hbct/maxline.c + * contrib/hbct/numcount.c + * contrib/hbct/addascii.c + * contrib/xhb/xhbenum.c + * contrib/xhb/xhbqself.c + * contrib/xhb/xhbwith.c + * contrib/xhb/hbcomprs.c + * contrib/xhb/xhbmsgs.c + * contrib/hbmzip/hbmzip.c + * contrib/xpp/dbcmdx.c + * contrib/hbnetio/netiocli.c + * contrib/rddsql/sqlbase.c + * contrib/rddsql/sqlmix.c + * contrib/rddads/adsx.c + * contrib/rddads/ads1.c + * contrib/hbbmcdx/bmdbfcdx.c + * contrib/hbbmcdx/hbbmcdx.h + * contrib/hbbtree/hb_btree.h + * contrib/hbbtree/hb_btree.c + * LONG -> HB_LONG, long (for dates and extend / item API contexts) + (except for external (OS) API specific usage) + + * src/vm/maindll.c + * LONG -> void * + + Added 'const' to char * parameter. + + * contrib/hbct/numline.c + * contrib/hbct/ctpad.c + * LONG -> HB_LONG, HB_ISIZ + * Formatting. + + * contrib/xhb/hbxml.h + * LONG -> HB_ISIZ + + * contrib/xhb/freadlin.c + * LONG, int -> HB_ISIZ + 2010-02-08 19:03 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/gtwin/gtwin.c * ULONG -> HB_SIZE diff --git a/harbour/contrib/hbbmcdx/bmdbfcdx.c b/harbour/contrib/hbbmcdx/bmdbfcdx.c index b753cfc1b4..8900648f8c 100644 --- a/harbour/contrib/hbbmcdx/bmdbfcdx.c +++ b/harbour/contrib/hbbmcdx/bmdbfcdx.c @@ -4028,7 +4028,7 @@ static int hb_cdxPageSeekKey( LPCDXPAGE pPage, LPCDXKEY pKey, ULONG ulKeyRec ) */ static HB_BOOL hb_cdxCheckRecordScope( CDXAREAP pArea, ULONG ulRec ) { - LONG lRecNo = ( LONG ) ulRec; + HB_LONG lRecNo = ( HB_LONG ) ulRec; if( SELF_COUNTSCOPE( ( AREAP ) pArea, NULL, &lRecNo ) == HB_SUCCESS && lRecNo == 0 ) { @@ -5389,7 +5389,7 @@ static HB_BOOL hb_cdxCurKeyRefresh( CDXAREAP pArea, LPCDXTAG pTag ) /* * skip to next/previous unique key */ -static HB_ERRCODE hb_cdxDBOISkipUnique( CDXAREAP pArea, LPCDXTAG pTag, LONG lToSkip ) +static HB_ERRCODE hb_cdxDBOISkipUnique( CDXAREAP pArea, LPCDXTAG pTag, HB_LONG lToSkip ) { HB_ERRCODE retval; HB_BOOL fForward; @@ -5920,7 +5920,7 @@ static ULONG hb_cdxDBOIScopeEval( LPCDXTAG pTag, HB_EVALSCOPE_FUNC pFunc, void * /* * return number of keys in order */ -static LONG hb_cdxDBOIKeyCount( CDXAREAP pArea, LPCDXTAG pTag, HB_BOOL fFilters ) +static HB_LONG hb_cdxDBOIKeyCount( CDXAREAP pArea, LPCDXTAG pTag, HB_BOOL fFilters ) { ULONG ulKeyCount = 0; HB_BOOL fLogOpt = pArea->dbfarea.area.dbfi.itmCobExpr || !pArea->dbfarea.area.dbfi.fFilter; @@ -6023,7 +6023,7 @@ static LONG hb_cdxDBOIKeyCount( CDXAREAP pArea, LPCDXTAG pTag, HB_BOOL fFilters /* * return logical key position in order */ -static LONG hb_cdxDBOIKeyNo( CDXAREAP pArea, LPCDXTAG pTag, HB_BOOL fFilters ) +static HB_LONG hb_cdxDBOIKeyNo( CDXAREAP pArea, LPCDXTAG pTag, HB_BOOL fFilters ) { ULONG ulKeyNo = 0; HB_BOOL fLogOpt = pArea->dbfarea.area.dbfi.itmCobExpr || !pArea->dbfarea.area.dbfi.fFilter; @@ -7136,7 +7136,7 @@ HB_FUNC( BM_DBSEEKWILD ) #endif /* ( DBENTRYP_L ) hb_cdxSkip : NULL */ -static HB_ERRCODE hb_cdxSkip( CDXAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_cdxSkip( CDXAREAP pArea, HB_LONG lToSkip ) { LPCDXTAG pTag; ULONG ulPos, ulRec; @@ -7202,7 +7202,7 @@ static HB_ERRCODE hb_cdxSkip( CDXAREAP pArea, LONG lToSkip ) /* * Reposition cursor respecting any filter setting. */ -static HB_ERRCODE hb_cdxSkipFilter( CDXAREAP pArea, LONG lUpDown ) +static HB_ERRCODE hb_cdxSkipFilter( CDXAREAP pArea, HB_LONG lUpDown ) { HB_BOOL fBottom, fDeleted; HB_ERRCODE uiError; @@ -7290,7 +7290,7 @@ static HB_ERRCODE hb_cdxSkipFilter( CDXAREAP pArea, LONG lUpDown ) } /* ( DBENTRYP_L ) hb_cdxSkipRaw */ -static HB_ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, HB_LONG lToSkip ) { LPCDXTAG pTag; HB_ERRCODE retval; @@ -9371,7 +9371,7 @@ static HB_ERRCODE hb_cdxClearFilter( CDXAREAP pArea ) /* ( DBENTRYP_V ) hb_cdxClearScope : NULL */ /* ( DBENTRYP_VPLP ) hb_cdxCountScope */ -static HB_ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, LONG * plRec ) +static HB_ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, HB_LONG * plRec ) { HB_TRACE(HB_TR_DEBUG, ("hb_cdxCountScope(%p, %p, %p)", pArea, pPtr, plRec)); @@ -9558,12 +9558,12 @@ static int hb_cdxQuickSortCompare( LPCDXSORTINFO pSort, HB_BYTE * pKey1, HB_BYTE return i; } -static HB_BOOL hb_cdxQSort( LPCDXSORTINFO pSort, HB_BYTE * pSrc, HB_BYTE * pBuf, LONG lKeys ) +static HB_BOOL hb_cdxQSort( LPCDXSORTINFO pSort, HB_BYTE * pSrc, HB_BYTE * pBuf, HB_LONG lKeys ) { if( lKeys > 1 ) { int iLen = pSort->keyLen + 4; - LONG l1, l2; + HB_LONG l1, l2; HB_BYTE * pPtr1, * pPtr2, *pDst; HB_BOOL f1, f2; @@ -9796,7 +9796,7 @@ static void hb_cdxSortGetPageKey( LPCDXSORTINFO pSort, ULONG ulPage, static void hb_cdxSortOrderPages( LPCDXSORTINFO pSort ) { int iLen = pSort->keyLen, i; - LONG l, r, m; + HB_LONG l, r, m; ULONG n, ulPage, ulRec; HB_BYTE *pKey = NULL, *pTmp; @@ -9834,7 +9834,7 @@ static void hb_cdxSortOrderPages( LPCDXSORTINFO pSort ) static HB_BOOL hb_cdxSortKeyGet( LPCDXSORTINFO pSort, HB_BYTE ** pKeyVal, ULONG *pulRec ) { int iLen = pSort->keyLen, i; - LONG l, r, m; + HB_LONG l, r, m; ULONG ulPage; ulPage = pSort->pSortedPages[ pSort->ulFirst ]; @@ -9871,7 +9871,7 @@ static HB_BOOL hb_cdxSortKeyGet( LPCDXSORTINFO pSort, HB_BYTE ** pKeyVal, ULONG else r = m - 1; } - if( l > ( LONG ) pSort->ulFirst + 1 ) + if( l > ( HB_LONG ) pSort->ulFirst + 1 ) { ulPage = pSort->pSortedPages[ pSort->ulFirst ]; for( r = pSort->ulFirst + 1; r < l; r++ ) @@ -10195,7 +10195,7 @@ static void hb_cdxTagDoIndex( LPCDXTAG pTag, HB_BOOL fReindex ) LPCDXSORTINFO pSort; PHB_ITEM pForItem, pWhileItem = NULL, pEvalItem = NULL, pItem = NULL; ULONG ulRecCount, ulRecNo = pArea->dbfarea.ulRecNo; - LONG lStep = 0; + HB_LONG lStep = 0; PHB_CODEPAGE cdpTmp = hb_cdpSelect( pArea->dbfarea.area.cdPage ); if( pArea->dbfarea.area.lpdbOrdCondInfo ) diff --git a/harbour/contrib/hbbmcdx/hbbmcdx.h b/harbour/contrib/hbbmcdx/hbbmcdx.h index a4d64c8c2b..82eb64713b 100644 --- a/harbour/contrib/hbbmcdx/hbbmcdx.h +++ b/harbour/contrib/hbbmcdx/hbbmcdx.h @@ -136,7 +136,7 @@ HB_EXTERN_BEGIN */ #define HB_CDXMAXKEY( x ) ( ( HB_USHORT ) ( ( x ) > CDX_MAXKEY ? CDX_MAXKEY : ( x ) ) ) -#define HB_CDXBITMASK( x ) ( ( LONG ) ( ( 1L << ( x ) ) - 1 ) ) +#define HB_CDXBITMASK( x ) ( ( HB_LONG ) ( ( 1L << ( x ) ) - 1 ) ) #define FAST_GOCOLD( A ) SELF_GOCOLD(A) @@ -513,9 +513,9 @@ static HB_ERRCODE hb_cdxGoBottom( CDXAREAP pArea ); #define hb_cdxGoToId NULL static HB_ERRCODE hb_cdxGoTop( CDXAREAP pArea ); 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 ); +static HB_ERRCODE hb_cdxSkip( CDXAREAP pArea, HB_LONG lToSkip ); +static HB_ERRCODE hb_cdxSkipFilter( CDXAREAP pArea, HB_LONG lUpDown ); +static HB_ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, HB_LONG lToSkip ); #define hb_cdxAddField NULL static HB_ERRCODE hb_cdxAppend( CDXAREAP pArea, HB_BOOL bUnLockAll ); #define hb_cdxCreateFields NULL @@ -577,7 +577,7 @@ static HB_ERRCODE hb_cdxOrderInfo( CDXAREAP pArea, HB_USHORT uiIndex, LPDBORDERI static HB_ERRCODE hb_cdxClearFilter( CDXAREAP pArea ); #define hb_cdxClearLocate NULL #define hb_cdxClearScope NULL -static HB_ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, LONG * plRec ); +static HB_ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, HB_LONG * plRec ); #define hb_cdxFilterText NULL #define hb_cdxScopeInfo NULL static HB_ERRCODE hb_cdxSetFilter( CDXAREAP pArea, LPDBFILTERINFO pFilterInfo ); diff --git a/harbour/contrib/hbbtree/hb_btree.c b/harbour/contrib/hbbtree/hb_btree.c index f9a1c54f28..115aa4f0cc 100644 --- a/harbour/contrib/hbbtree/hb_btree.c +++ b/harbour/contrib/hbbtree/hb_btree.c @@ -142,7 +142,7 @@ typedef struct ioBuffer_tag ULONG * pulPageCount; /* TODO: use LE get macro to retrieve this; better yet, dont use this */ ULONG * pulBranch; union { - LONG * plData; /* not in-memory */ + HB_LONG * plData; /* not in-memory */ PHB_ITEM * ppData; /* in-memory */ } xData; HB_BYTE * szKey; @@ -178,7 +178,7 @@ typedef int hb_BTreeFlags_T; typedef struct hb_KeyData_Tag { union { - LONG lData; /* lData is placed first for alignment, thought it is secondary */ + HB_LONG lData; /* lData is placed first for alignment, thought it is secondary */ PHB_ITEM pData; } xData; HB_BYTE szKey[ 1 ]; @@ -282,7 +282,7 @@ static ioBuffer_T * ioOneBufferAlloc( struct hb_BTree * pBTree, ioBuffer_T * pre } else { - thisptr->xData.plData = ( LONG * )&thisptr->pulBranch[ pBTree->usMaxKeys + 1 ]; + thisptr->xData.plData = ( HB_LONG * )&thisptr->pulBranch[ pBTree->usMaxKeys + 1 ]; thisptr->szKey = ( HB_BYTE * )&thisptr->xData.plData[ pBTree->usMaxKeys ]; } @@ -465,11 +465,11 @@ static void StackPeek( BTreeStack **pStack, ULONG *pulNode, int *piPosition ) } } -static LONG StackSkip( struct hb_BTree * pBTree, BTreeStack **pStack, LONG records ) +static HB_LONG StackSkip( struct hb_BTree * pBTree, BTreeStack **pStack, HB_LONG records ) { ULONG ulNode; int iPosition; - LONG recordsskipped = 0; + HB_LONG recordsskipped = 0; if ( ( *pStack )->usCount == 0 ) { @@ -709,7 +709,7 @@ static void CountSet( struct hb_BTree * pBTree, ULONG ulNode, ULONG newPageCount pBTree->ioBuffer->IsDirty = pBTree->IsDirtyFlagAssignment; } -static HB_USHORT CountAdj( struct hb_BTree * pBTree, ULONG ulNode, LONG adjPageCount ) +static HB_USHORT CountAdj( struct hb_BTree * pBTree, ULONG ulNode, HB_LONG adjPageCount ) { READPAGE_IF_NEEDED( pBTree, ulNode ); @@ -722,7 +722,7 @@ static HB_USHORT CountAdj( struct hb_BTree * pBTree, ULONG ulNode, LONG adjPageC static void NodeCopy( struct hb_BTree * pBTree, ULONG toNode, int toPosition, ULONG fromNode, int fromPosition, hb_KeyData_T *buffer ) { ULONG ulBranch; - LONG lData = 0; + HB_LONG lData = 0; PHB_ITEM pData = NULL; READPAGE_IF_NEEDED( pBTree, fromNode ); @@ -842,10 +842,10 @@ static void KeySet( struct hb_BTree * pBTree, ULONG ulNode, int iPosition, hb_Ke pBTree->ioBuffer->IsDirty = pBTree->IsDirtyFlagAssignment; } -static LONG KeyCompare( struct hb_BTree * pBTree, hb_KeyData_T *left, hb_KeyData_T *right ) +static HB_LONG KeyCompare( struct hb_BTree * pBTree, hb_KeyData_T *left, hb_KeyData_T *right ) { -/* LONG lResults = strnicmp( left->szKey, right->szKey, pBTree->usKeySize );*/ - LONG lResults = ( pBTree->pStrCompare )( ( const char * ) left->szKey, ( const char * ) right->szKey, pBTree->usKeySize ); +/* HB_LONG lResults = strnicmp( left->szKey, right->szKey, pBTree->usKeySize );*/ + HB_LONG lResults = ( pBTree->pStrCompare )( ( const char * ) left->szKey, ( const char * ) right->szKey, pBTree->usKeySize ); if ( lResults == 0 && GETFLAG( pBTree, IsUnique ) ) { @@ -1334,7 +1334,7 @@ static HB_BOOL RecDelete( struct hb_BTree * pBTree, hb_KeyData_T *target, ULONG } #endif -HB_BOOL hb_BTreeDelete( struct hb_BTree * pBTree, const char *target, LONG lData ) +HB_BOOL hb_BTreeDelete( struct hb_BTree * pBTree, const char *target, HB_LONG lData ) { ULONG ulNode; int iPosition; @@ -1403,9 +1403,9 @@ void hb_BTreeGoBottom( struct hb_BTree * pBTree ) KeyGet( pBTree, ulLastNode, CountGet( pBTree, ulLastNode ), pBTree->pThisKeyData ); } -LONG hb_BTreeSkip( struct hb_BTree * pBTree, LONG records ) +LONG hb_BTreeSkip( struct hb_BTree * pBTree, HB_LONG records ) { - LONG results = 0; + HB_LONG results = 0; int iPosition; hb_KeyData_T *keydata; BTreeStack *pStack = NULL; @@ -1436,7 +1436,7 @@ LONG hb_BTreeSkip( struct hb_BTree * pBTree, LONG records ) return results; } -HB_BOOL hb_BTreeSeek( struct hb_BTree * pBTree, const char *szKey, LONG lData, HB_BOOL bSoftSeek ) +HB_BOOL hb_BTreeSeek( struct hb_BTree * pBTree, const char *szKey, HB_LONG lData, HB_BOOL bSoftSeek ) { HB_BOOL results = HB_FALSE; int iPosition; @@ -1759,7 +1759,7 @@ HB_FUNC( HB_BTREECLOSE ) /* hb_BTreeClose( hb_BTree_Handle ) -> NIL */ s_BTree_List[ hb_parni( 1 ) - 1 ] = NULL; } -HB_FUNC( HB_BTREEINSERT ) /* hb_BTreeInsert( hb_BTree_Handle, CHAR cKey, LONG lData | ANY xData ) -> lSuccess */ +HB_FUNC( HB_BTREEINSERT ) /* hb_BTreeInsert( hb_BTree_Handle, CHAR cKey, HB_LONG lData | ANY xData ) -> lSuccess */ { struct hb_BTree * pBTree = BTree_GetTreeIndex( "hb_btreeinsert" ); /* PHB_ITEM pKeyCode = hb_param( 1, HB_IT_NUMERIC ); */ @@ -1784,7 +1784,7 @@ HB_FUNC( HB_BTREEINSERT ) /* hb_BTreeInsert( hb_BTree_Handle, CHAR cKey, LONG l } } -HB_FUNC( HB_BTREEDELETE ) /* hb_BTreeDelete( hb_BTree_Handle, CHAR cKey, LONG lData ) -> lSuccess */ +HB_FUNC( HB_BTREEDELETE ) /* hb_BTreeDelete( hb_BTree_Handle, CHAR cKey, HB_LONG lData ) -> lSuccess */ { HB_TRACE( HB_TR_DEBUG, ( SRCLINENO ) ); if ( HB_ISNUM( 1 ) && HB_ISCHAR( 2 ) && ( hb_pcount() == 2 || HB_ISNUM( 3 ) ) ) @@ -1813,8 +1813,8 @@ HB_FUNC( HB_BTREEKEY ) /* hb_BTreeKey( hb_BTree_Handle ) -> CHAR cKey */ hb_retc( ( char * ) BTree_GetTreeIndex( "hb_btreekey" )->pThisKeyData->szKey ); } -HB_FUNC( HB_BTREEDATA ) /* hb_BtreeData( hb_BTree_Handle ) -> LONG lOldData | xOldData */ -{ /*, [ LONG lNewData | ANY xNewData ] ??? */ +HB_FUNC( HB_BTREEDATA ) /* hb_BtreeData( hb_BTree_Handle ) -> HB_LONG lOldData | xOldData */ +{ /*, [ HB_LONG lNewData | ANY xNewData ] ??? */ struct hb_BTree * pBTree = BTree_GetTreeIndex( "hb_btreeinfo" ); HB_TRACE( HB_TR_DEBUG, ( SRCLINENO ) ); if ( GETFLAG( pBTree, IsInMemory ) ) @@ -1846,12 +1846,12 @@ HB_FUNC( HB_BTREEGOBOTTOM ) /* hb_BTreeGoBottom( hb_BTree_Handle ) --> NIL */ hb_BTreeGoBottom( BTree_GetTreeIndex( "hb_btreegobottom" ) ); } -HB_FUNC( HB_BTREESKIP ) /* hb_BTreeSkip( hb_BTree_Handle, LONG nRecords ) -> LONG nRecordsSkipped */ +HB_FUNC( HB_BTREESKIP ) /* hb_BTreeSkip( hb_BTree_Handle, HB_LONG nRecords ) -> HB_LONG nRecordsSkipped */ { HB_TRACE( HB_TR_DEBUG, ( SRCLINENO ) ); if ( HB_ISNUM( 1 ) && ( hb_pcount() == 1 || HB_ISNUM( 2 ) ) ) { - LONG nSkip = hb_pcount() == 1 ? 1 : hb_parnl( 2 ); + HB_LONG nSkip = hb_pcount() == 1 ? 1 : hb_parnl( 2 ); hb_retnl( hb_BTreeSkip( BTree_GetTreeIndex( "hb_btreeskip" ), nSkip ) ); } else @@ -1861,7 +1861,7 @@ HB_FUNC( HB_BTREESKIP ) /* hb_BTreeSkip( hb_BTree_Handle, LONG nRecords ) -> LO } } -HB_FUNC( HB_BTREESEEK ) /* hb_BTreeSeek( hb_BTree_Handle, CHAR cKey, LONG lData, BOOL lSoftSeek ) -> lSuccess */ +HB_FUNC( HB_BTREESEEK ) /* hb_BTreeSeek( hb_BTree_Handle, CHAR cKey, HB_LONG lData, BOOL lSoftSeek ) -> lSuccess */ { HB_TRACE( HB_TR_DEBUG, ( SRCLINENO ) ); if ( HB_ISNUM( 1 ) && HB_ISCHAR( 2 ) ) diff --git a/harbour/contrib/hbbtree/hb_btree.h b/harbour/contrib/hbbtree/hb_btree.h index 8553bd9aeb..60c7cb017a 100644 --- a/harbour/contrib/hbbtree/hb_btree.h +++ b/harbour/contrib/hbbtree/hb_btree.h @@ -46,11 +46,11 @@ struct hb_BTree * hb_BTreeNew( const char * FileName, HB_USHORT usPageSize, HB_U struct hb_BTree *hb_BTreeOpen( const char *FileName, ULONG ulFlags, ULONG ulBuffers ); void hb_BTreeClose( struct hb_BTree * pBTree ); HB_BOOL hb_BTreeInsert( struct hb_BTree * pBTree, const char * szKey, PHB_ITEM pData ); -HB_BOOL hb_BTreeDelete( struct hb_BTree * pBTree, const char * szKey, LONG lData ); +HB_BOOL hb_BTreeDelete( struct hb_BTree * pBTree, const char * szKey, HB_LONG lData ); void hb_BTreeGoTop( struct hb_BTree * pBTree ); void hb_BTreeGoBottom( struct hb_BTree * pBTree ); -HB_BOOL hb_BTreeSeek( struct hb_BTree * pBTree, const char *szKey, LONG lData, HB_BOOL bSoftSeek ); -LONG hb_BTreeSkip( struct hb_BTree * pBTree, LONG records ); +HB_BOOL hb_BTreeSeek( struct hb_BTree * pBTree, const char *szKey, HB_LONG lData, HB_BOOL bSoftSeek ); +LONG hb_BTreeSkip( struct hb_BTree * pBTree, HB_LONG records ); const char * hb_BTreeKey( struct hb_BTree * pBTree ); LONG hb_BTreeData( struct hb_BTree * pBTree ); PHB_ITEM hb_BTreeDataItem( struct hb_BTree * pBTree ); diff --git a/harbour/contrib/hbct/addascii.c b/harbour/contrib/hbct/addascii.c index 8ccf5bb2d2..102c63bd2d 100644 --- a/harbour/contrib/hbct/addascii.c +++ b/harbour/contrib/hbct/addascii.c @@ -133,7 +133,7 @@ HB_FUNC( ADDASCII ) HB_SIZE sLen = hb_parclen( 1 ); char *pcResult; HB_SIZE sPos; - LONG lValue; + HB_LONG lValue; int iCarryOver; if( HB_ISNUM( 3 ) ) @@ -170,11 +170,11 @@ HB_FUNC( ADDASCII ) if( iCarryOver ) { HB_SIZE sCurrent; - LONG lResult; + HB_LONG lResult; for( sCurrent = sPos; sCurrent > 0 && lValue != 0; sCurrent-- ) { - lResult = ( LONG ) pcSource[sCurrent - 1] + ( lValue % 256 ); + lResult = ( HB_LONG ) pcSource[sCurrent - 1] + ( lValue % 256 ); lValue /= 256; if( lResult > 255 ) @@ -187,7 +187,7 @@ HB_FUNC( ADDASCII ) } else { - pcResult[sPos - 1] = ( char ) ( ( ( LONG ) pcResult[sPos - 1] + lValue ) % 256 ); + pcResult[sPos - 1] = ( char ) ( ( ( HB_LONG ) pcResult[sPos - 1] + lValue ) % 256 ); } if( HB_ISBYREF( 1 ) ) diff --git a/harbour/contrib/hbct/ctpad.c b/harbour/contrib/hbct/ctpad.c index 134e2c17d5..1d608834ca 100644 --- a/harbour/contrib/hbct/ctpad.c +++ b/harbour/contrib/hbct/ctpad.c @@ -66,7 +66,7 @@ static void do_pad( int iSwitch ) const char *pcString = hb_parc( 1 ); HB_SIZE sStrLen = hb_parclen( 1 ); char *pcRet, *pc; - LONG lRetLen; + HB_ISIZ lRetLen; HB_SIZE sRetLen; char cFill; diff --git a/harbour/contrib/hbct/maxline.c b/harbour/contrib/hbct/maxline.c index 40aa29aa53..ce243aa836 100644 --- a/harbour/contrib/hbct/maxline.c +++ b/harbour/contrib/hbct/maxline.c @@ -55,18 +55,18 @@ HB_FUNC( MAXLINE ) { - LONG lLength = 0; + HB_ISIZ lLength = 0; if( HB_ISCHAR( 1 ) ) { const char *pcString = hb_parc( 1 ); const char *pBuffer; - LONG lStrLen = hb_parclen( 1 ); + HB_ISIZ lStrLen = hb_parclen( 1 ); while( lStrLen > 0 ) { pBuffer = ( char * ) memchr( pcString, 13, lStrLen ); - if( !pBuffer ) + if( ! pBuffer ) pBuffer = pcString + lStrLen; if( pBuffer - pcString > lLength ) diff --git a/harbour/contrib/hbct/numcount.c b/harbour/contrib/hbct/numcount.c index 4d3b02d1e8..b4dec33bbe 100644 --- a/harbour/contrib/hbct/numcount.c +++ b/harbour/contrib/hbct/numcount.c @@ -53,7 +53,7 @@ #include "hbapi.h" -static LONG s_lCounter = 0; +static HB_LONG s_lCounter = 0; HB_FUNC( NUMCOUNT ) { diff --git a/harbour/contrib/hbct/numline.c b/harbour/contrib/hbct/numline.c index fcb6ccb60b..4da83159eb 100644 --- a/harbour/contrib/hbct/numline.c +++ b/harbour/contrib/hbct/numline.c @@ -55,27 +55,23 @@ HB_FUNC( NUMLINE ) { - LONG lLines = 0; + HB_LONG lLines = 0; if( HB_ISCHAR( 1 ) ) { - const char *pcString = hb_parc( 1 ); - const char *pBuffer; - LONG lStrLen = hb_parclen( 1 ); - LONG lLength = HB_ISNUM( 2 ) ? hb_parnl( 2 ) : 80; + const char * pcString = hb_parc( 1 ); + const char * pBuffer; + HB_ISIZ lStrLen = hb_parclen( 1 ); + HB_ISIZ lLength = HB_ISNUM( 2 ) ? hb_parnl( 2 ) : 80; while( lStrLen > 0 ) { pBuffer = ( char * ) memchr( pcString, 13, lStrLen ); - if( !pBuffer ) - { + if( ! pBuffer ) pBuffer = pcString + lStrLen; - } if( ( pBuffer - pcString ) > lLength ) - { pBuffer = pcString + lLength; - } else { pBuffer++; diff --git a/harbour/contrib/hbmzip/hbmzip.c b/harbour/contrib/hbmzip/hbmzip.c index 2964b44760..d151e31b60 100644 --- a/harbour/contrib/hbmzip/hbmzip.c +++ b/harbour/contrib/hbmzip/hbmzip.c @@ -737,7 +737,7 @@ static int hb_zipStoreFile( zipFile hZip, const char* szFileName, const char* sz ulExtAttr = GetFileAttributes( ( LPCTSTR ) lpFileName ); - if( ( LONG ) ulExtAttr != -1 ) + if( ( HB_LONG ) ulExtAttr != -1 ) { ulExtAttr = GetFileAttributes( ( LPCTSTR ) lpFileName ) & ( FILE_ATTRIBUTE_READONLY | FILE_ATTRIBUTE_HIDDEN | diff --git a/harbour/contrib/hbnetio/netiocli.c b/harbour/contrib/hbnetio/netiocli.c index ec89c48a2f..7062cc94b0 100644 --- a/harbour/contrib/hbnetio/netiocli.c +++ b/harbour/contrib/hbnetio/netiocli.c @@ -174,7 +174,7 @@ static HB_BOOL s_fileSendMsg( PHB_CONCLI conn, HB_BYTE * msgbuf, { HB_BYTE buffer[ 2048 ]; HB_BYTE * msg, * ptr = NULL; - LONG lSent = 0, lLast = 1, l; + HB_LONG lSent = 0, lLast = 1, l; HB_BOOL fResult = HB_FALSE; if( len == 0 ) diff --git a/harbour/contrib/rddads/ads1.c b/harbour/contrib/rddads/ads1.c index cd5f96fd57..abdb8320a9 100644 --- a/harbour/contrib/rddads/ads1.c +++ b/harbour/contrib/rddads/ads1.c @@ -413,7 +413,7 @@ static void adsGetKeyItem( ADSAREAP pArea, PHB_ITEM pItem, int iKeyType, /* hack for timestamp values, we need sth better yo detect timestamp indexes */ if( pArea->iFileType == ADS_ADT && pKeyBuf[ 0 ] == 0 && ( iKeyLen == 8 || iKeyLen == 4 ) ) { - LONG lDate, lTime; + long lDate, lTime; lDate = HB_GET_BE_UINT32( pKeyBuf ); if( iKeyLen == 8 ) { @@ -478,7 +478,7 @@ static void adsGetKeyItem( ADSAREAP pArea, PHB_ITEM pItem, int iKeyType, else /* ADS_CDX, ADS_ADT, ADS_VFP */ { HB_ORD2DBL( pKeyBuf, &dValue ); - hb_itemPutDL( pItem, ( LONG ) dValue ); + hb_itemPutDL( pItem, ( long ) dValue ); } break; @@ -1211,7 +1211,7 @@ static HB_ERRCODE adsSeek( ADSAREAP pArea, HB_BOOL bSoftSeek, PHB_ITEM pKey, HB_ return HB_SUCCESS; } -static HB_ERRCODE adsSkip( ADSAREAP pArea, LONG lToSkip ) +static HB_ERRCODE adsSkip( ADSAREAP pArea, HB_LONG lToSkip ) { UNSIGNED32 u32RetVal; @@ -1274,7 +1274,7 @@ static HB_ERRCODE adsSkip( ADSAREAP pArea, LONG lToSkip ) else { HB_ERRCODE errCode = HB_SUCCESS; - LONG lSkipper; + HB_LONG lSkipper; if( !pArea->fPositioned && lToSkip < 0 ) { @@ -1348,7 +1348,7 @@ static HB_ERRCODE adsSkip( ADSAREAP pArea, LONG lToSkip ) } } -static HB_ERRCODE adsSkipFilter( ADSAREAP pArea, LONG lUpDown ) +static HB_ERRCODE adsSkipFilter( ADSAREAP pArea, HB_LONG lUpDown ) { UNSIGNED32 u32RetVal; HB_BOOL fBottom; @@ -2189,7 +2189,7 @@ static HB_ERRCODE adsGetValue( ADSAREAP pArea, HB_USHORT uiIndex, PHB_ITEM pItem if( pField->uiTypeExtended == ADS_SHORTINT ) hb_itemPutNILen( pItem, ( int ) lVal, 6 ); else - hb_itemPutNLLen( pItem, ( LONG ) lVal, 11 ); + hb_itemPutNLLen( pItem, ( long ) lVal, 11 ); } break; } @@ -3129,7 +3129,7 @@ static HB_ERRCODE adsInfo( ADSAREAP pArea, HB_USHORT uiIndex, PHB_ITEM pItem ) if( uRetVal != AE_SUCCESS ) return HB_FAILURE; - hb_itemPutNL( pItem, ( LONG ) u16Count ); + hb_itemPutNL( pItem, ( long ) u16Count ); break; } @@ -4462,8 +4462,8 @@ static HB_ERRCODE adsOrderInfo( ADSAREAP pArea, HB_USHORT uiIndex, LPDBORDERINFO #if ADS_LIB_VERSION >= 900 case DBOI_SKIPUNIQUE: { - LONG lToSkip = pOrderInfo->itmNewVal && HB_IS_NUMERIC( pOrderInfo->itmNewVal ) ? - hb_itemGetNL( pOrderInfo->itmNewVal ) : 1; + HB_LONG lToSkip = pOrderInfo->itmNewVal && HB_IS_NUMERIC( pOrderInfo->itmNewVal ) ? + hb_itemGetNL( pOrderInfo->itmNewVal ) : 1; if( hIndex ) { hb_itemPutL( pOrderInfo->itmResult, diff --git a/harbour/contrib/rddads/adsx.c b/harbour/contrib/rddads/adsx.c index 200335f5f2..bfb2a199ab 100644 --- a/harbour/contrib/rddads/adsx.c +++ b/harbour/contrib/rddads/adsx.c @@ -394,7 +394,7 @@ static LPMIXTAG mixTagCreate( const char * szTagName, PHB_ITEM pKeyExpr, PHB_ITE LPDBORDERCONDINFO pOrdCondInfo = pArea->adsarea.area.lpdbOrdCondInfo; ADSHANDLE hOrder; ULONG ulRec, ulStartRec, ulNextCount = 0; - LONG lStep = 0; + HB_LONG lStep = 0; PHB_ITEM pItem, pEvalItem = NULL; @@ -695,7 +695,7 @@ static HB_ERRCODE adsxSeek( ADSXAREAP pArea, HB_BOOL bSoftSeek, PHB_ITEM pKey, H } -static HB_ERRCODE adsxSkip( ADSXAREAP pArea, LONG lToSkip ) +static HB_ERRCODE adsxSkip( ADSXAREAP pArea, HB_LONG lToSkip ) { LPMIXKEY pKey; ULONG ulKeyPos; diff --git a/harbour/contrib/rddsql/sqlbase.c b/harbour/contrib/rddsql/sqlbase.c index d3285cde90..5ba9fd1c03 100644 --- a/harbour/contrib/rddsql/sqlbase.c +++ b/harbour/contrib/rddsql/sqlbase.c @@ -341,7 +341,7 @@ static HB_ERRCODE sqlbaseGoTop( SQLBASEAREAP pArea ) } -static HB_ERRCODE sqlbaseSkip( SQLBASEAREAP pArea, LONG lToSkip ) +static HB_ERRCODE sqlbaseSkip( SQLBASEAREAP pArea, HB_LONG lToSkip ) { HB_ERRCODE errCode; @@ -375,7 +375,7 @@ static HB_ERRCODE sqlbaseSkip( SQLBASEAREAP pArea, LONG lToSkip ) } -static HB_ERRCODE sqlbaseSkipRaw( SQLBASEAREAP pArea, LONG lToSkip ) +static HB_ERRCODE sqlbaseSkipRaw( SQLBASEAREAP pArea, HB_LONG lToSkip ) { HB_ERRCODE errCode; diff --git a/harbour/contrib/rddsql/sqlmix.c b/harbour/contrib/rddsql/sqlmix.c index 58ab19a874..20048787a3 100644 --- a/harbour/contrib/rddsql/sqlmix.c +++ b/harbour/contrib/rddsql/sqlmix.c @@ -798,7 +798,7 @@ static PMIXTAG hb_mixTagCreate( const char* szTagName, PHB_ITEM pKeyExpr, PHB_IT PMIXKEY pKey = NULL; LPDBORDERCONDINFO pOrdCondInfo = pArea->sqlarea.area.lpdbOrdCondInfo; ULONG ulStartRec, ulNextCount = 0; - LONG lStep = 0; + HB_LONG lStep = 0; PHB_ITEM pItem, pEvalItem = NULL; pTag = ( PMIXTAG ) hb_xgrab( sizeof( MIXTAG ) ); @@ -1007,7 +1007,7 @@ static void hb_mixTagGoBottom( PMIXTAG pTag ) } -static void hb_mixTagSkip( PMIXTAG pTag, LONG lSkip ) +static void hb_mixTagSkip( PMIXTAG pTag, HB_LONG lSkip ) { PMIXNODE pNode, pNode2; unsigned int uiPos, uiPos2; @@ -1024,14 +1024,14 @@ static void hb_mixTagSkip( PMIXTAG pTag, LONG lSkip ) { if ( pNode->Leaf ) { - if ( ( LONG ) (pNode->KeyCount - 1 - uiPos) >= lSkip ) + if ( ( HB_LONG ) (pNode->KeyCount - 1 - uiPos) >= lSkip ) { uiPos += lSkip; lSkip = 0; } else if ( pNode->KeyCount - 1 > uiPos ) { - lSkip -= ( LONG ) (pNode->KeyCount - 1 - uiPos); + lSkip -= ( HB_LONG ) (pNode->KeyCount - 1 - uiPos); uiPos = pNode->KeyCount - 1; } if ( lSkip ) @@ -1083,7 +1083,7 @@ static void hb_mixTagSkip( PMIXTAG pTag, LONG lSkip ) { if ( pNode->Leaf ) { - if ( ( LONG ) uiPos >= lSkip ) + if ( ( HB_LONG ) uiPos >= lSkip ) { uiPos -= lSkip; lSkip = 0; @@ -1419,7 +1419,7 @@ static HB_ERRCODE sqlmixSeek( SQLMIXAREAP pArea, HB_BOOL fSoftSeek, PHB_ITEM pIt } -static HB_ERRCODE sqlmixSkipRaw( SQLMIXAREAP pArea, LONG lToSkip ) +static HB_ERRCODE sqlmixSkipRaw( SQLMIXAREAP pArea, HB_LONG lToSkip ) { PMIXTAG pTag = pArea->pTag; HB_BOOL fOut = HB_FALSE; diff --git a/harbour/contrib/xhb/freadlin.c b/harbour/contrib/xhb/freadlin.c index 98b5109104..3077e1f6e4 100644 --- a/harbour/contrib/xhb/freadlin.c +++ b/harbour/contrib/xhb/freadlin.c @@ -58,11 +58,11 @@ #define READING_BLOCK 4096 -char * hb_fsReadLine( HB_FHANDLE hFileHandle, LONG * plBuffLen, const char ** Term, int * iTermSizes, int iTerms, HB_BOOL * bFound, HB_BOOL * bEOF ) +char * hb_fsReadLine( HB_FHANDLE hFileHandle, HB_ISIZ * plBuffLen, const char ** Term, HB_ISIZ * iTermSizes, HB_ISIZ iTerms, HB_BOOL * bFound, HB_BOOL * bEOF ) { - int iPosTerm = 0, iPos, iPosition; + HB_ISIZ iPosTerm = 0, iPos, iPosition; int nTries; - LONG lRead = 0, lOffset, lSize; + HB_ISIZ lRead = 0, lOffset, lSize; char * pBuff; HB_TRACE(HB_TR_DEBUG, ("hb_fsReadLine(%p, %ld, %p, %p, %i, %i, %i)", ( void * ) ( HB_PTRDIFF ) hFileHandle, *plBuffLen, Term, iTermSizes, iTerms, *bFound, *bEOF )); @@ -168,9 +168,9 @@ HB_FUNC( HB_FREADLINE ) HB_FHANDLE hFileHandle = ( HB_FHANDLE ) hb_parnint( 1 ); const char ** Term; char * pBuffer; - int * iTermSizes; - LONG lSize = hb_parnl( 4 ); - int i, iTerms; + HB_ISIZ * iTermSizes; + HB_ISIZ lSize = hb_parnl( 4 ); + HB_ISIZ i, iTerms; HB_BOOL bFound, bEOF; if( ( !HB_ISBYREF( 2 ) ) || ( !HB_ISNUM( 1 ) ) ) @@ -188,7 +188,7 @@ HB_FUNC( HB_FREADLINE ) if( HB_ISARRAY( 3 ) ) { pTerm1 = hb_param( 3, HB_IT_ARRAY ); - iTerms = ( int ) hb_arrayLen( pTerm1 ); + iTerms = hb_arrayLen( pTerm1 ); if( iTerms <= 0 ) { @@ -201,7 +201,7 @@ HB_FUNC( HB_FREADLINE ) } Term = ( const char ** ) hb_xgrab( sizeof( char * ) * iTerms ); - iTermSizes = ( int * ) hb_xgrab( sizeof( int ) * iTerms ); + iTermSizes = ( HB_ISIZ * ) hb_xgrab( sizeof( HB_ISIZ ) * iTerms ); for( i = 0; i < iTerms; i++ ) { @@ -213,7 +213,7 @@ HB_FUNC( HB_FREADLINE ) { pTerm1 = hb_param( 3, HB_IT_STRING ); Term = ( const char ** ) hb_xgrab( sizeof( char * ) ); - iTermSizes = ( int * ) hb_xgrab( sizeof( int ) ); + iTermSizes = ( HB_ISIZ * ) hb_xgrab( sizeof( HB_ISIZ ) ); Term[ 0 ] = hb_itemGetCPtr( pTerm1 ); iTermSizes[ 0 ] = hb_itemGetCLen( pTerm1 ); iTerms = 1; @@ -222,7 +222,7 @@ HB_FUNC( HB_FREADLINE ) else { Term = ( const char ** ) hb_xgrab( sizeof( char * ) ); - iTermSizes = ( int * ) hb_xgrab( sizeof( int ) ); + iTermSizes = ( HB_ISIZ * ) hb_xgrab( sizeof( HB_ISIZ ) ); Term[ 0 ] = "\r\n"; /* Should be preplaced with the default EOL sequence */ iTerms = 1; iTermSizes[ 0 ] = 2; diff --git a/harbour/contrib/xhb/hbcomprs.c b/harbour/contrib/xhb/hbcomprs.c index 8008de7952..4c989349c1 100644 --- a/harbour/contrib/xhb/hbcomprs.c +++ b/harbour/contrib/xhb/hbcomprs.c @@ -160,7 +160,7 @@ HB_FUNC( HB_COMPRESS ) { if (pDestLen != NULL ) { - hb_stornl( iFirst + 4, ( LONG ) ulDstlen ); + hb_stornl( iFirst + 4, ( long ) ulDstlen ); hb_retni( Z_OK ); } else diff --git a/harbour/contrib/xhb/hbxml.h b/harbour/contrib/xhb/hbxml.h index 3b4a0412e1..ea5369de23 100644 --- a/harbour/contrib/xhb/hbxml.h +++ b/harbour/contrib/xhb/hbxml.h @@ -164,8 +164,8 @@ typedef struct tag_mxml_refil int bufpos; /* current position */ /* lenght of the stream for implementing progress indicators */ - LONG streampos; - LONG streamlen; + HB_ISIZ streampos; + HB_ISIZ streamlen; /* callback funcs */ MXML_REFIL_FUNC refil_func; diff --git a/harbour/contrib/xhb/xhbenum.c b/harbour/contrib/xhb/xhbenum.c index c60d20f3ce..86dcc1e445 100644 --- a/harbour/contrib/xhb/xhbenum.c +++ b/harbour/contrib/xhb/xhbenum.c @@ -57,7 +57,7 @@ HB_FUNC( HB_ENUMINDEX ) { - LONG lFuncOffset = hb_stackBaseOffset() - 1, lIndex = 0; + HB_LONG lFuncOffset = hb_stackBaseOffset() - 1, lIndex = 0; while( --lFuncOffset > 0 ) { PHB_ITEM pItem = hb_stackItem( lFuncOffset ); diff --git a/harbour/contrib/xhb/xhbmsgs.c b/harbour/contrib/xhb/xhbmsgs.c index 44203529b9..0791ca20cc 100644 --- a/harbour/contrib/xhb/xhbmsgs.c +++ b/harbour/contrib/xhb/xhbmsgs.c @@ -297,7 +297,7 @@ HB_FUNC( XHB_GREATEREQ ) * data from tail */ #undef HB_IS_VALID_INDEX -#define HB_IS_VALID_INDEX( idx, max ) ( ( ( LONG ) (idx) < 0 ? (idx) += (max) + 1 : (idx) ) > 0 && ( HB_SIZE ) (idx) <= (max) ) +#define HB_IS_VALID_INDEX( idx, max ) ( ( ( HB_LONG ) (idx) < 0 ? (idx) += (max) + 1 : (idx) ) > 0 && ( HB_SIZE ) (idx) <= (max) ) HB_FUNC( XHB_INDEX ) { diff --git a/harbour/contrib/xhb/xhbqself.c b/harbour/contrib/xhb/xhbqself.c index 6947dd0bd1..2d9aa0a3f7 100644 --- a/harbour/contrib/xhb/xhbqself.c +++ b/harbour/contrib/xhb/xhbqself.c @@ -58,7 +58,7 @@ HB_FUNC( HB_QSELF ) { - LONG lOffset = hb_stackBaseProcOffset( 1 ); + HB_LONG lOffset = hb_stackBaseProcOffset( 1 ); if( lOffset > 0 ) { diff --git a/harbour/contrib/xhb/xhbwith.c b/harbour/contrib/xhb/xhbwith.c index 43b67e7641..8f233e6883 100644 --- a/harbour/contrib/xhb/xhbwith.c +++ b/harbour/contrib/xhb/xhbwith.c @@ -56,13 +56,13 @@ #include "hbapierr.h" #include "hbstack.h" -static PHB_ITEM hb_vmWithObjectItem( LONG lLevel ) +static PHB_ITEM hb_vmWithObjectItem( HB_LONG lLevel ) { - LONG lOffset = hb_stackWithObjectOffset(); + HB_LONG lOffset = hb_stackWithObjectOffset(); while( lOffset && lLevel > 0 ) { - LONG * plOffset = ( LONG * ) hb_itemGetPtr( hb_stackItem( lOffset + 1 ) ); + HB_LONG * plOffset = ( HB_LONG * ) hb_itemGetPtr( hb_stackItem( lOffset + 1 ) ); if( !plOffset ) break; --lLevel; @@ -72,13 +72,13 @@ static PHB_ITEM hb_vmWithObjectItem( LONG lLevel ) return ( lOffset && !lLevel ) ? hb_stackItem( lOffset ) : NULL; } -static LONG hb_vmWithObjectCount( void ) +static HB_LONG hb_vmWithObjectCount( void ) { - LONG lOffset = hb_stackWithObjectOffset(), lCount = 0; + HB_LONG lOffset = hb_stackWithObjectOffset(), lCount = 0; while( lOffset ) { - LONG * plOffset = ( LONG * ) hb_itemGetPtr( hb_stackItem( lOffset + 1 ) ); + HB_LONG * plOffset = ( HB_LONG * ) hb_itemGetPtr( hb_stackItem( lOffset + 1 ) ); if( !plOffset ) break; ++lCount; diff --git a/harbour/contrib/xpp/dbcmdx.c b/harbour/contrib/xpp/dbcmdx.c index 127a0c0b5a..88f5462d52 100644 --- a/harbour/contrib/xpp/dbcmdx.c +++ b/harbour/contrib/xpp/dbcmdx.c @@ -129,8 +129,8 @@ HB_FUNC( DBSKIPPER ) if( pArea ) { - LONG lSkipped = 0; - LONG lRecs = 1; + HB_LONG lSkipped = 0; + HB_LONG lRecs = 1; HB_BOOL fBEof; ULONG ulRecords = 0; diff --git a/harbour/include/hbapi.h b/harbour/include/hbapi.h index a5fc61264e..887195b288 100644 --- a/harbour/include/hbapi.h +++ b/harbour/include/hbapi.h @@ -270,7 +270,7 @@ struct _HB_EXTREF; typedef struct _HB_STACK_STATE { - LONG lBaseItem; /* stack base offset of previous func/proc */ + HB_LONG lBaseItem; /* stack base offset of previous func/proc */ ULONG ulPrivateBase; /* memvars base offset of previous func/proc */ void * pStatics; /* statics frame of previous func/proc */ HB_USHORT uiClass; /* class when message is sent */ @@ -350,15 +350,15 @@ struct hb_struRefer struct _HB_ITEM * itemPtr; /* item pointer */ struct _HB_ITEM ** *itemsbasePtr; /* local variables */ } BasePtr; - LONG offset; /* 0 for static variables */ - LONG value; + HB_LONG offset; /* 0 for static variables */ + HB_LONG value; }; struct hb_struEnum { struct _HB_ITEM * basePtr; /* base item pointer */ struct _HB_ITEM * valuePtr; /* value item pointer */ - LONG offset; + HB_LONG offset; }; struct hb_struExtRef @@ -1034,8 +1034,8 @@ extern HB_EXPORT HB_BOOL hb_winmainArgGet( HANDLE * phInstance, HANDLE * phPrevI extern HB_EXPORT void * hb_codeblockId( PHB_ITEM pItem ); /* retrieves the codeblock unique ID */ extern HB_CODEBLOCK_PTR hb_codeblockNew( const HB_BYTE * pBuffer, HB_USHORT uiLocals, const HB_BYTE * pLocalPosTable, PHB_SYMB pSymbols, HB_SIZE ulLen ); /* create a code-block */ extern HB_CODEBLOCK_PTR hb_codeblockMacroNew( const HB_BYTE * pBuffer, HB_SIZE ulLen ); -extern PHB_ITEM hb_codeblockGetVar( PHB_ITEM pItem, LONG iItemPos ); /* get local variable referenced in a codeblock */ -extern PHB_ITEM hb_codeblockGetRef( HB_CODEBLOCK_PTR pCBlock, LONG iItemPos ); /* get local variable passed by reference */ +extern PHB_ITEM hb_codeblockGetVar( PHB_ITEM pItem, HB_LONG iItemPos ); /* get local variable referenced in a codeblock */ +extern PHB_ITEM hb_codeblockGetRef( HB_CODEBLOCK_PTR pCBlock, HB_LONG iItemPos ); /* get local variable passed by reference */ extern void hb_codeblockEvaluate( HB_ITEM_PTR pItem ); /* evaluate a codeblock */ /* memvars subsystem */ diff --git a/harbour/include/hbapifs.h b/harbour/include/hbapifs.h index ebc23f19b1..ccab88987e 100644 --- a/harbour/include/hbapifs.h +++ b/harbour/include/hbapifs.h @@ -272,7 +272,7 @@ extern HB_EXPORT HB_FHANDLE hb_spCreateEx( const char * pFilename, HB_FATTR ulAt typedef struct { char szName[ HB_PATH_MAX ]; - LONG lDate; + long lDate; char szDate[ 9 ]; /* in YYYYMMDD format */ char szTime[ 9 ]; /* in HH:MM:SS format */ HB_FATTR attr; diff --git a/harbour/include/hbapirdd.h b/harbour/include/hbapirdd.h index 900cec934c..089da41322 100644 --- a/harbour/include/hbapirdd.h +++ b/harbour/include/hbapirdd.h @@ -217,9 +217,9 @@ typedef struct _DBORDERCONDINFO PHB_ITEM itmCobFor; PHB_ITEM itmCobWhile; PHB_ITEM itmCobEval; - LONG lStep; + HB_LONG lStep; PHB_ITEM itmStartRecID; - LONG lNextCount; + HB_LONG lNextCount; PHB_ITEM itmRecID; HB_BOOL fRest; HB_BOOL fDescending; @@ -591,7 +591,7 @@ typedef AREA * LPAREA; typedef HB_ERRCODE ( * DBENTRYP_V )( AREAP area ); 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_L )( AREAP area, HB_LONG param ); typedef HB_ERRCODE ( * DBENTRYP_UL )( AREAP area, ULONG param ); typedef HB_ERRCODE ( * DBENTRYP_I )( AREAP area, PHB_ITEM param ); typedef HB_ERRCODE ( * DBENTRYP_SI )( AREAP area, HB_USHORT index, PHB_ITEM param ); @@ -615,7 +615,7 @@ typedef HB_ERRCODE ( * DBENTRYP_CP )( AREAP area, char * param ); typedef HB_ERRCODE ( * DBENTRYP_CC )( AREAP area, const char * param ); typedef HB_ERRCODE ( * DBENTRYP_PP )( AREAP area, HB_BYTE ** param ); typedef HB_ERRCODE ( * DBENTRYP_S )( AREAP area, HB_USHORT param ); -typedef HB_ERRCODE ( * DBENTRYP_LP )( AREAP area, LONG * param ); +typedef HB_ERRCODE ( * DBENTRYP_LP )( AREAP area, HB_LONG * param ); typedef HB_ERRCODE ( * DBENTRYP_ULP )( AREAP area, ULONG * param ); typedef HB_ERRCODE ( * DBENTRYP_SVP )( AREAP area, HB_USHORT index, void * param ); typedef HB_ERRCODE ( * DBENTRYP_SSP )( AREAP area, HB_USHORT index, HB_USHORT * param ); @@ -626,8 +626,8 @@ typedef HB_ERRCODE ( * DBENTRYP_SVL )( AREAP area, HB_USHORT index, ULONG * pa typedef HB_ERRCODE ( * DBENTRYP_SSI )( AREAP area, HB_USHORT p1, HB_USHORT p2, PHB_ITEM p3 ); typedef HB_ERRCODE ( * DBENTRYP_ISI )( AREAP area, PHB_ITEM p1, HB_USHORT p2, PHB_ITEM 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_VPL )( AREAP area, void * p1, HB_LONG p2 ); +typedef HB_ERRCODE ( * DBENTRYP_VPLP )( AREAP area, void * p1, HB_LONG * p2 ); typedef HB_ERRCODE ( * DBENTRYP_LSP )( AREAP area, ULONG p1, HB_BOOL * p2 ); /* this methods DO USE take a Workarea but an RDDNODE */ diff --git a/harbour/include/hbcomp.h b/harbour/include/hbcomp.h index 513143c538..c87309fbe6 100644 --- a/harbour/include/hbcomp.h +++ b/harbour/include/hbcomp.h @@ -75,7 +75,7 @@ typedef void * HB_VOID_PTR; typedef HB_PCODE_FUNC( HB_PCODE_FUNC_, HB_VOID_PTR ); typedef HB_PCODE_FUNC_ * HB_PCODE_FUNC_PTR; -extern LONG hb_compPCodeSize( PFUNCTION, ULONG ); +extern HB_LONG hb_compPCodeSize( PFUNCTION, ULONG ); extern void hb_compPCodeEval( PFUNCTION, const HB_PCODE_FUNC_PTR *, void * ); extern void hb_compPCodeTrace( PFUNCTION, const HB_PCODE_FUNC_PTR *, void * ); @@ -178,9 +178,9 @@ extern void hb_compLoopKill( PFUNCTION ); extern void hb_compGenError( HB_COMP_DECL, const char * szErrors[], char cPrefix, int iError, const char * szError1, const char * szError2 ); /* generic parsing error management function */ extern void hb_compGenWarning( HB_COMP_DECL, const char * szWarnings[], char cPrefix, int iWarning, const char * szWarning1, const char * szWarning2); /* generic parsing warning management function */ -extern ULONG hb_compGenJump( LONG, HB_COMP_DECL ); /* generates the pcode to jump to a specific offset */ -extern ULONG hb_compGenJumpFalse( LONG, HB_COMP_DECL ); /* generates the pcode to jump if false */ -extern ULONG hb_compGenJumpTrue( LONG, HB_COMP_DECL ); /* generates the pcode to jump if true */ +extern ULONG hb_compGenJump( HB_LONG, HB_COMP_DECL ); /* generates the pcode to jump to a specific offset */ +extern ULONG hb_compGenJumpFalse( HB_LONG, HB_COMP_DECL ); /* generates the pcode to jump if false */ +extern ULONG hb_compGenJumpTrue( HB_LONG, HB_COMP_DECL ); /* generates the pcode to jump if true */ extern void hb_compGenJumpHere( ULONG, HB_COMP_DECL ); /* returns the pcode pos where to set a jump offset */ extern void hb_compGenJumpThere( ULONG, ULONG, HB_COMP_DECL ); /* sets a jump offset */ diff --git a/harbour/include/hbdefs.h b/harbour/include/hbdefs.h index 976e62d313..6c2e955b92 100644 --- a/harbour/include/hbdefs.h +++ b/harbour/include/hbdefs.h @@ -541,7 +541,7 @@ typedef HB_MAXUINT HB_VMMAXUINT; /* * It's a hack for compilers which don't support LL suffix for LONGLONG * numeric constant. This suffix is necessary for some compilers - - * without it they cut the number to LONG + * without it they cut the number to HB_LONG */ #if defined( __BORLANDC__ ) # if __BORLANDC__ >= 1328 @@ -734,7 +734,7 @@ typedef HB_U32 HB_FATTR; #define HB_HIWORD( l ) ( ( HB_U16 ) ( ( ( l ) >> 16 ) & 0xFFFF ) ) #define HB_MKSHORT( lo, hi ) ( ( HB_SHORT ) ( ( ( HB_I16 ) ( hi ) ) << 8 ) | ( lo ) ) #define HB_MKUSHORT( lo, hi ) ( ( HB_USHORT ) ( ( ( HB_U16 ) ( hi ) ) << 8 ) | ( lo ) ) -#define HB_MKLONG( b1, b2, b3, b4 ) ( ( LONG ) \ +#define HB_MKLONG( b1, b2, b3, b4 ) ( ( HB_LONG ) \ ( ( ( ( HB_I32 ) ( b4 ) ) << 24 ) | \ ( ( ( HB_I32 ) ( b3 ) ) << 16 ) | \ ( ( ( HB_I32 ) ( b2 ) ) << 8 ) | \ @@ -1445,12 +1445,12 @@ typedef HB_U32 HB_FATTR; #define HB_PCODE_MKSHORT( p ) (( HB_SHORT ) HB_GET_LE_INT16( p )) #define HB_PCODE_MKUSHORT( p ) (( HB_USHORT ) HB_GET_LE_UINT16( p )) -#define HB_PCODE_MKLONG( p ) (( LONG ) HB_GET_LE_INT32( p )) +#define HB_PCODE_MKLONG( p ) (( HB_LONG ) HB_GET_LE_INT32( p )) #define HB_PCODE_MKULONG( p ) (( ULONG ) HB_GET_LE_UINT32( p )) #define HB_PCODE_MKLONGLONG( p ) (( HB_LONGLONG ) HB_GET_LE_INT64( p )) #define HB_PCODE_MKULONGLONG( p ) (( HB_ULONGLONG ) HB_GET_LE_UINT64( p )) #define HB_PCODE_MKDOUBLE( p ) (( double ) HB_GET_LE_DOUBLE( p )) -#define HB_PCODE_MKINT24( p ) (( LONG ) HB_GET_LE_INT24( p )) +#define HB_PCODE_MKINT24( p ) (( HB_LONG ) HB_GET_LE_INT24( p )) #define HB_PCODE_MKUINT24( p ) (( ULONG ) HB_GET_LE_UINT24( p )) /* diff --git a/harbour/include/hbexprb.c b/harbour/include/hbexprb.c index 44d5908b04..6b574c6baf 100644 --- a/harbour/include/hbexprb.c +++ b/harbour/include/hbexprb.c @@ -916,7 +916,7 @@ static HB_EXPR_FUNC( hb_compExprUseIIF ) { /* this is called if all three parts of IIF expression should be generated */ - LONG lPosFalse, lPosEnd; + HB_LONG lPosFalse, lPosEnd; HB_EXPR_PTR pExpr = pSelf->value.asList.pExprList; HB_EXPR_USE( pExpr, HB_EA_PUSH_PCODE ); @@ -936,7 +936,7 @@ static HB_EXPR_FUNC( hb_compExprUseIIF ) { /* this is called if all three parts of IIF expression should be generated */ - LONG lPosFalse, lPosEnd; + HB_LONG lPosFalse, lPosEnd; HB_EXPR_PTR pExpr = pSelf->value.asList.pExprList; HB_EXPR_USE( pExpr, HB_EA_PUSH_PCODE ); @@ -1306,12 +1306,12 @@ static HB_EXPR_FUNC( hb_compExprUseArrayAt ) if( pIdx->ExprType == HB_ET_NUMERIC ) { HB_EXPR_PTR pExpr = pSelf->value.asList.pExprList; /* the expression that holds an array */ - LONG lIndex; + HB_LONG lIndex; if( pIdx->value.asNum.NumType == HB_ET_LONG ) - lIndex = ( LONG ) pIdx->value.asNum.val.l; + lIndex = ( HB_LONG ) pIdx->value.asNum.val.l; else - lIndex = ( LONG ) pIdx->value.asNum.val.d; + lIndex = ( HB_LONG ) pIdx->value.asNum.val.d; if( pExpr->ExprType == HB_ET_ARRAY ) /* is it a literal array */ { @@ -3087,7 +3087,7 @@ static HB_EXPR_FUNC( hb_compExprUseOr ) case HB_EA_PUSH_PCODE: if( HB_COMP_ISSUPPORTED( HB_COMPFLAG_SHORTCUTS ) ) { - LONG lEndPos; + HB_LONG lEndPos; HB_EXPR_USE( pSelf->value.asOperator.pLeft, HB_EA_PUSH_PCODE ); HB_GEN_FUNC1( PCode1, HB_P_DUPLICATE ); @@ -3110,7 +3110,7 @@ static HB_EXPR_FUNC( hb_compExprUseOr ) case HB_EA_PUSH_POP: if( HB_COMP_ISSUPPORTED( HB_COMPFLAG_SHORTCUTS ) ) { - LONG lEndPos; + HB_LONG lEndPos; HB_EXPR_USE( pSelf->value.asOperator.pLeft, HB_EA_PUSH_PCODE ); lEndPos = HB_GEN_FUNC1( JumpTrue, 0 ); /* NOTE: This will not generate a runtime error if incompatible @@ -3172,7 +3172,7 @@ static HB_EXPR_FUNC( hb_compExprUseAnd ) case HB_EA_PUSH_PCODE: if( HB_COMP_ISSUPPORTED( HB_COMPFLAG_SHORTCUTS ) ) { - LONG lEndPos; + HB_LONG lEndPos; HB_EXPR_USE( pSelf->value.asOperator.pLeft, HB_EA_PUSH_PCODE ); HB_GEN_FUNC1( PCode1, HB_P_DUPLICATE ); @@ -3195,7 +3195,7 @@ static HB_EXPR_FUNC( hb_compExprUseAnd ) case HB_EA_PUSH_POP: if( HB_COMP_ISSUPPORTED( HB_COMPFLAG_SHORTCUTS ) ) { - LONG lEndPos; + HB_LONG lEndPos; HB_EXPR_USE( pSelf->value.asOperator.pLeft, HB_EA_PUSH_PCODE ); lEndPos = HB_GEN_FUNC1( JumpFalse, 0 ); /* NOTE: This will not generate a runtime error if incompatible diff --git a/harbour/include/hbmacro.h b/harbour/include/hbmacro.h index 09efb415aa..36adef0853 100644 --- a/harbour/include/hbmacro.h +++ b/harbour/include/hbmacro.h @@ -123,11 +123,11 @@ extern void hb_macroGenPCode3( HB_BYTE byte1, HB_BYTE byte2, HB_BYTE byte3, HB_C extern void hb_macroGenPCode4( HB_BYTE byte1, HB_BYTE byte2, HB_BYTE byte3, HB_BYTE byte4, HB_COMP_DECL ); extern void hb_macroGenPCodeN( HB_BYTE * pBuffer, ULONG ulSize, HB_COMP_DECL ); -extern ULONG hb_macroGenJump( LONG lOffset, HB_COMP_DECL ); -extern ULONG hb_macroGenJumpFalse( LONG lOffset, HB_COMP_DECL ); +extern ULONG hb_macroGenJump( HB_LONG lOffset, HB_COMP_DECL ); +extern ULONG hb_macroGenJumpFalse( HB_LONG lOffset, HB_COMP_DECL ); extern void hb_macroGenJumpThere( ULONG ulFrom, ULONG ulTo, HB_COMP_DECL ); extern void hb_macroGenJumpHere( ULONG ulOffset, HB_COMP_DECL ); -extern ULONG hb_macroGenJumpTrue( LONG lOffset, HB_COMP_DECL ); +extern ULONG hb_macroGenJumpTrue( HB_LONG lOffset, HB_COMP_DECL ); extern void hb_macroGenPushSymbol( const char * szSymbolName, HB_BOOL bFunction, HB_COMP_DECL ); extern void hb_macroGenPushLong( HB_MAXINT lNumber, HB_COMP_DECL ); diff --git a/harbour/include/hbrddcdx.h b/harbour/include/hbrddcdx.h index 757752518b..61e566cc0b 100644 --- a/harbour/include/hbrddcdx.h +++ b/harbour/include/hbrddcdx.h @@ -130,7 +130,7 @@ HB_EXTERN_BEGIN */ #define HB_CDXMAXKEY( x ) ( ( USHORT ) ( ( x ) > CDX_MAXKEY ? CDX_MAXKEY : ( x ) ) ) -#define HB_CDXBITMASK( x ) ( ( LONG ) ( ( 1L << ( x ) ) - 1 ) ) +#define HB_CDXBITMASK( x ) ( ( HB_LONG ) ( ( 1L << ( x ) ) - 1 ) ) /* #define FAST_GOCOLD( A ) ((A)->dbfarea.fRecordChanged || (A)->fCdxAppend ? (SELF_GOCOLD((AREAP)(A))) : HB_SUCCESS) */ #define FAST_GOCOLD( A ) SELF_GOCOLD(A) diff --git a/harbour/include/hbstack.h b/harbour/include/hbstack.h index fbf66f88bc..106ee2cc53 100644 --- a/harbour/include/hbstack.h +++ b/harbour/include/hbstack.h @@ -159,9 +159,9 @@ typedef struct PHB_ITEM * pItems; /* pointer to the stack items */ PHB_ITEM * pBase; /* stack frame position for the current function call */ HB_ITEM Return; /* latest returned value */ - LONG wItems; /* total items that may be holded on the stack */ - LONG lWithObject; /* stack offset to base current WITH OBJECT item */ - LONG lRecoverBase; /* current SEQUENCE envelope offset or 0 if no SEQUENCE is active */ + HB_LONG wItems; /* total items that may be holded on the stack */ + HB_LONG lWithObject; /* stack offset to base current WITH OBJECT item */ + HB_LONG lRecoverBase; /* current SEQUENCE envelope offset or 0 if no SEQUENCE is active */ HB_USHORT uiActionRequest;/* request for some action - stop processing of opcodes */ HB_USHORT uiQuitState; /* HVM is quiting */ HB_STACK_STATE state; /* first (default) stack state frame */ @@ -270,9 +270,9 @@ typedef struct HB_EXPORT extern HB_ITEM_PTR hb_stackItemFromTop( int nFromTop ); extern HB_ITEM_PTR hb_stackItemFromBase( int nFromBase ); -extern LONG hb_stackTopOffset( void ); -extern LONG hb_stackBaseOffset( void ); -extern LONG hb_stackTotalItems( void ); +extern HB_LONG hb_stackTopOffset( void ); +extern HB_LONG hb_stackBaseOffset( void ); +extern HB_LONG hb_stackTotalItems( void ); extern HB_ITEM_PTR hb_stackBaseItem( void ); extern HB_ITEM_PTR hb_stackItem( long iItemPos ); extern HB_ITEM_PTR hb_stackSelfItem( void ); /* returns Self object at C function level */ @@ -286,11 +286,11 @@ extern void hb_stackPush( void ); /* pushes an item on to the stack extern HB_ITEM_PTR hb_stackAllocItem( void ); /* allocates new item on the top of stack, returns pointer to it */ extern void hb_stackPushReturn( void ); extern void hb_stackPopReturn( void ); -extern void hb_stackRemove( LONG lUntilPos ); +extern void hb_stackRemove( HB_LONG lUntilPos ); /* stack management functions */ extern int hb_stackCallDepth( void ); -extern LONG hb_stackBaseProcOffset( int iLevel ); +extern HB_LONG hb_stackBaseProcOffset( int iLevel ); extern void hb_stackBaseProcInfo( char * szProcName, HB_USHORT * puiProcLine ); /* get current .prg function name and line number */ extern void hb_stackDispLocal( void ); /* show the types of the items on the stack for debugging purposes */ extern void hb_stackDispCall( void ); @@ -320,8 +320,8 @@ extern void hb_stackClearMemvarsBase( void ); extern HB_ITEM_PTR hb_stackLocalVariable( int *piFromBase ); extern PHB_ITEM ** hb_stackItemBasePtr( void ); -extern LONG hb_stackGetRecoverBase( void ); -extern void hb_stackSetRecoverBase( LONG lBase ); +extern HB_LONG hb_stackGetRecoverBase( void ); +extern void hb_stackSetRecoverBase( HB_LONG lBase ); extern HB_USHORT hb_stackGetActionRequest( void ); extern void hb_stackSetActionRequest( HB_USHORT uiAction ); @@ -329,8 +329,8 @@ extern void hb_stackSetStaticsBase( void * pBase ); extern void * hb_stackGetStaticsBase( void ); extern PHB_ITEM hb_stackWithObjectItem( void ); -extern LONG hb_stackWithObjectOffset( void ); -extern void hb_stackWithObjectSetOffset( LONG ); +extern HB_LONG hb_stackWithObjectOffset( void ); +extern void hb_stackWithObjectSetOffset( HB_LONG ); extern int * hb_stackKeyPolls( void ); extern HB_BOOL * hb_stackDebugRequest( void ); diff --git a/harbour/include/hbsxfunc.h b/harbour/include/hbsxfunc.h index 98379ec99e..118c06740d 100644 --- a/harbour/include/hbsxfunc.h +++ b/harbour/include/hbsxfunc.h @@ -62,8 +62,8 @@ HB_EXTERN_BEGIN -char * hb_sxDtoP( char * pDate, LONG lJulian ); -LONG hb_sxPtoD( const char * pDate ); +char * hb_sxDtoP( char * pDate, long lJulian ); +long hb_sxPtoD( const char * pDate ); void hb_sxEnCrypt( const char * pSrc, char * pDst, const char * pKeyVal, HB_SIZE ulLen ); void hb_sxDeCrypt( const char * pSrc, char * pDst, const char * pKeyVal, HB_SIZE ulLen ); diff --git a/harbour/include/hbxvm.h b/harbour/include/hbxvm.h index de81c71595..79f309c69e 100644 --- a/harbour/include/hbxvm.h +++ b/harbour/include/hbxvm.h @@ -134,7 +134,7 @@ extern HB_EXPORT HB_BOOL hb_xvmPushAlias( void ); extern HB_EXPORT HB_BOOL hb_xvmPopAlias( void ); /* select the workarea using a given item or a substituted value */ extern HB_EXPORT HB_BOOL hb_xvmPopLogical( HB_BOOL * ); /* pops the stack latest value and returns its logical value */ extern HB_EXPORT HB_BOOL hb_xvmSwapAlias( void ); /* swaps items on the eval stack and pops the workarea number */ -extern HB_EXPORT HB_BOOL hb_xvmLocalAddInt( int iLocal, LONG lAdd ); /* add integer to given local variable */ +extern HB_EXPORT HB_BOOL hb_xvmLocalAddInt( int iLocal, HB_LONG lAdd ); /* add integer to given local variable */ extern HB_EXPORT HB_BOOL hb_xvmLocalInc( int iLocal ); /* increment given local variable */ extern HB_EXPORT HB_BOOL hb_xvmLocalDec( int iLocal ); /* decrement given local variable */ extern HB_EXPORT HB_BOOL hb_xvmLocalIncPush( int iLocal ); /* increment given local variable and pussh it on HVM stack */ @@ -232,25 +232,25 @@ extern HB_EXPORT void hb_xvmPushLongLong( HB_LONGLONG llNumber ); */ extern HB_EXPORT HB_BOOL hb_xvmArrayItemPush( HB_SIZE ulIndex ); extern HB_EXPORT HB_BOOL hb_xvmArrayItemPop( HB_SIZE ulIndex ); -extern HB_EXPORT HB_BOOL hb_xvmMultByInt( LONG lValue ); -extern HB_EXPORT HB_BOOL hb_xvmDivideByInt( LONG lValue ); -extern HB_EXPORT HB_BOOL hb_xvmAddInt( LONG lValue ); -extern HB_EXPORT void hb_xvmLocalSetInt( int iLocal, LONG lValue ); +extern HB_EXPORT HB_BOOL hb_xvmMultByInt( HB_LONG lValue ); +extern HB_EXPORT HB_BOOL hb_xvmDivideByInt( HB_LONG lValue ); +extern HB_EXPORT HB_BOOL hb_xvmAddInt( HB_LONG lValue ); +extern HB_EXPORT void hb_xvmLocalSetInt( int iLocal, HB_LONG lValue ); /*extern HB_EXPORT void hb_xvmLocalSetStr( int iLocal, const char * pValue, HB_SIZE ulLen );*/ extern HB_EXPORT void hb_xvmPushFuncSymbol( PHB_SYMB pSym ); -extern HB_EXPORT HB_BOOL hb_xvmLessThenInt( LONG lValue ); -extern HB_EXPORT HB_BOOL hb_xvmLessThenIntIs( LONG lValue, HB_BOOL * fValue ); -extern HB_EXPORT HB_BOOL hb_xvmLessEqualThenInt( LONG lValue ); -extern HB_EXPORT HB_BOOL hb_xvmLessEqualThenIntIs( LONG lValue, HB_BOOL * fValue ); -extern HB_EXPORT HB_BOOL hb_xvmGreaterThenInt( LONG lValue ); -extern HB_EXPORT HB_BOOL hb_xvmGreaterThenIntIs( LONG lValue, HB_BOOL * fValue ); -extern HB_EXPORT HB_BOOL hb_xvmGreaterEqualThenInt( LONG lValue ); -extern HB_EXPORT HB_BOOL hb_xvmGreaterEqualThenIntIs( LONG lValue, HB_BOOL * fValue ); -extern HB_EXPORT HB_BOOL hb_xvmEqualInt( LONG lValue ); -extern HB_EXPORT HB_BOOL hb_xvmEqualIntIs( LONG lValue, HB_BOOL * fValue ); -extern HB_EXPORT HB_BOOL hb_xvmNotEqualInt( LONG lValue ); -extern HB_EXPORT HB_BOOL hb_xvmNotEqualIntIs( LONG lValue, HB_BOOL * fValue ); +extern HB_EXPORT HB_BOOL hb_xvmLessThenInt( HB_LONG lValue ); +extern HB_EXPORT HB_BOOL hb_xvmLessThenIntIs( HB_LONG lValue, HB_BOOL * fValue ); +extern HB_EXPORT HB_BOOL hb_xvmLessEqualThenInt( HB_LONG lValue ); +extern HB_EXPORT HB_BOOL hb_xvmLessEqualThenIntIs( HB_LONG lValue, HB_BOOL * fValue ); +extern HB_EXPORT HB_BOOL hb_xvmGreaterThenInt( HB_LONG lValue ); +extern HB_EXPORT HB_BOOL hb_xvmGreaterThenIntIs( HB_LONG lValue, HB_BOOL * fValue ); +extern HB_EXPORT HB_BOOL hb_xvmGreaterEqualThenInt( HB_LONG lValue ); +extern HB_EXPORT HB_BOOL hb_xvmGreaterEqualThenIntIs( HB_LONG lValue, HB_BOOL * fValue ); +extern HB_EXPORT HB_BOOL hb_xvmEqualInt( HB_LONG lValue ); +extern HB_EXPORT HB_BOOL hb_xvmEqualIntIs( HB_LONG lValue, HB_BOOL * fValue ); +extern HB_EXPORT HB_BOOL hb_xvmNotEqualInt( HB_LONG lValue ); +extern HB_EXPORT HB_BOOL hb_xvmNotEqualIntIs( HB_LONG lValue, HB_BOOL * fValue ); extern HB_EXPORT HB_BOOL hb_xvmLocalAdd( int iLocal ); extern HB_EXPORT HB_BOOL hb_xvmStaticAdd( HB_USHORT uiStatic ); diff --git a/harbour/src/common/hbffind.c b/harbour/src/common/hbffind.c index daa7af6d6d..3261eeb473 100644 --- a/harbour/src/common/hbffind.c +++ b/harbour/src/common/hbffind.c @@ -485,7 +485,7 @@ static HB_BOOL hb_fsFindNextLow( PHB_FFIND ffind ) bFound = DosFindFirst( ( PCSZ ) ffind->pszFileMask, &info->hFindFile, - ( LONG ) hb_fsAttrToRaw( ffind->attrmask ), + ( ULONG ) hb_fsAttrToRaw( ffind->attrmask ), &info->entry, sizeof( info->entry ), &info->findCount, diff --git a/harbour/src/compiler/genc.c b/harbour/src/compiler/genc.c index 1103eb3b65..5cd3d743d3 100644 --- a/harbour/src/compiler/genc.c +++ b/harbour/src/compiler/genc.c @@ -798,9 +798,9 @@ static HB_GENC_FUNC( hb_p_jumpnear ) pFunc->pCode[ lPCodePos + 1 ] ); if( cargo->bVerbose ) { - LONG lOffset = ( signed char ) ( pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = ( signed char ) ( pFunc->pCode[ lPCodePos + 1 ] ); - fprintf( cargo->yyc, "\t/* %li (abs: %05li) */", lOffset, ( LONG ) ( lPCodePos + lOffset ) ); + fprintf( cargo->yyc, "\t/* %li (abs: %05li) */", lOffset, ( HB_LONG ) ( lPCodePos + lOffset ) ); } fprintf( cargo->yyc, "\n" ); return 2; @@ -813,9 +813,9 @@ static HB_GENC_FUNC( hb_p_jump ) pFunc->pCode[ lPCodePos + 2 ] ); if( cargo->bVerbose ) { - LONG lOffset = HB_PCODE_MKSHORT( &pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = HB_PCODE_MKSHORT( &pFunc->pCode[ lPCodePos + 1 ] ); - fprintf( cargo->yyc, "\t/* %li (abs: %05li) */", lOffset, ( LONG ) ( lPCodePos + lOffset ) ); + fprintf( cargo->yyc, "\t/* %li (abs: %05li) */", lOffset, ( HB_LONG ) ( lPCodePos + lOffset ) ); } fprintf( cargo->yyc, "\n" ); return 3; @@ -829,8 +829,8 @@ static HB_GENC_FUNC( hb_p_jumpfar ) pFunc->pCode[ lPCodePos + 3 ] ); if( cargo->bVerbose ) { - LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); - fprintf( cargo->yyc, "\t/* %li (abs: %08li) */", lOffset, ( LONG ) ( lPCodePos + lOffset ) ); + HB_LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); + fprintf( cargo->yyc, "\t/* %li (abs: %08li) */", lOffset, ( HB_LONG ) ( lPCodePos + lOffset ) ); } fprintf( cargo->yyc, "\n" ); return 4; @@ -842,8 +842,8 @@ static HB_GENC_FUNC( hb_p_jumpfalsenear ) pFunc->pCode[ lPCodePos + 1 ] ); if( cargo->bVerbose ) { - LONG lOffset = ( signed char ) ( pFunc->pCode[ lPCodePos + 1 ] ); - fprintf( cargo->yyc, "\t/* %li (abs: %05li) */", lOffset, ( LONG ) ( lPCodePos + lOffset ) ); + HB_LONG lOffset = ( signed char ) ( pFunc->pCode[ lPCodePos + 1 ] ); + fprintf( cargo->yyc, "\t/* %li (abs: %05li) */", lOffset, ( HB_LONG ) ( lPCodePos + lOffset ) ); } fprintf( cargo->yyc, "\n" ); return 2; @@ -856,8 +856,8 @@ static HB_GENC_FUNC( hb_p_jumpfalse ) pFunc->pCode[ lPCodePos + 2 ] ); if( cargo->bVerbose ) { - LONG lOffset = HB_PCODE_MKSHORT( &pFunc->pCode[ lPCodePos + 1 ] ); - fprintf( cargo->yyc, "\t/* %li (abs: %05li) */", lOffset, ( LONG ) ( lPCodePos + lOffset ) ); + HB_LONG lOffset = HB_PCODE_MKSHORT( &pFunc->pCode[ lPCodePos + 1 ] ); + fprintf( cargo->yyc, "\t/* %li (abs: %05li) */", lOffset, ( HB_LONG ) ( lPCodePos + lOffset ) ); } fprintf( cargo->yyc, "\n" ); return 3; @@ -871,8 +871,8 @@ static HB_GENC_FUNC( hb_p_jumpfalsefar ) pFunc->pCode[ lPCodePos + 3 ] ); if( cargo->bVerbose ) { - LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); - fprintf( cargo->yyc, "\t/* %li (abs: %08li) */", lOffset, ( LONG ) ( lPCodePos + lOffset ) ); + HB_LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); + fprintf( cargo->yyc, "\t/* %li (abs: %08li) */", lOffset, ( HB_LONG ) ( lPCodePos + lOffset ) ); } fprintf( cargo->yyc, "\n" ); return 4; @@ -884,8 +884,8 @@ static HB_GENC_FUNC( hb_p_jumptruenear ) pFunc->pCode[ lPCodePos + 1 ] ); if( cargo->bVerbose ) { - LONG lOffset = ( signed char ) ( pFunc->pCode[ lPCodePos + 1 ] ); - fprintf( cargo->yyc, "\t/* %li (abs: %05li) */", lOffset, ( LONG ) ( lPCodePos + lOffset ) ); + HB_LONG lOffset = ( signed char ) ( pFunc->pCode[ lPCodePos + 1 ] ); + fprintf( cargo->yyc, "\t/* %li (abs: %05li) */", lOffset, ( HB_LONG ) ( lPCodePos + lOffset ) ); } fprintf( cargo->yyc, "\n" ); return 2; @@ -898,8 +898,8 @@ static HB_GENC_FUNC( hb_p_jumptrue ) pFunc->pCode[ lPCodePos + 2 ] ); if( cargo->bVerbose ) { - LONG lOffset = HB_PCODE_MKSHORT( &pFunc->pCode[ lPCodePos + 1 ] ); - fprintf( cargo->yyc, "\t/* %li (abs: %05li) */", lOffset, ( LONG ) ( lPCodePos + lOffset ) ); + HB_LONG lOffset = HB_PCODE_MKSHORT( &pFunc->pCode[ lPCodePos + 1 ] ); + fprintf( cargo->yyc, "\t/* %li (abs: %05li) */", lOffset, ( HB_LONG ) ( lPCodePos + lOffset ) ); } fprintf( cargo->yyc, "\n" ); return 3; @@ -913,8 +913,8 @@ static HB_GENC_FUNC( hb_p_jumptruefar ) pFunc->pCode[ lPCodePos + 3 ] ); if( cargo->bVerbose ) { - LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); - fprintf( cargo->yyc, "\t/* %li (abs: %08li) */", lOffset, ( LONG ) ( lPCodePos + lOffset ) ); + HB_LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); + fprintf( cargo->yyc, "\t/* %li (abs: %08li) */", lOffset, ( HB_LONG ) ( lPCodePos + lOffset ) ); } fprintf( cargo->yyc, "\n" ); return 4; @@ -1869,7 +1869,7 @@ static HB_GENC_FUNC( hb_p_seqbegin ) pFunc->pCode[ lPCodePos + 3 ] ); if( cargo->bVerbose ) { - LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); fprintf( cargo->yyc, "\t/* %li (abs: %08li) */", lOffset, lPCodePos + lOffset ); } fprintf( cargo->yyc, "\n" ); @@ -1886,7 +1886,7 @@ static HB_GENC_FUNC( hb_p_seqend ) pFunc->pCode[ lPCodePos + 3 ] ); if( cargo->bVerbose ) { - LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); fprintf( cargo->yyc, "\t/* %li (abs: %08li) */", lOffset, lPCodePos + lOffset ); } fprintf( cargo->yyc, "\n" ); @@ -1910,7 +1910,7 @@ static HB_GENC_FUNC( hb_p_seqalways ) pFunc->pCode[ lPCodePos + 3 ] ); if( cargo->bVerbose ) { - LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); fprintf( cargo->yyc, "\t/* %li (abs: %08li) */", lOffset, lPCodePos + lOffset ); } fprintf( cargo->yyc, "\n" ); @@ -1930,7 +1930,7 @@ static HB_GENC_FUNC( hb_p_alwaysbegin ) pFunc->pCode[ lPCodePos + 3 ] ); if( cargo->bVerbose ) { - LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); fprintf( cargo->yyc, "\t/* %li (abs: %08li) */", lOffset, lPCodePos + lOffset ); } fprintf( cargo->yyc, "\n" ); diff --git a/harbour/src/compiler/gencc.c b/harbour/src/compiler/gencc.c index e7631408ea..75f6316a26 100644 --- a/harbour/src/compiler/gencc.c +++ b/harbour/src/compiler/gencc.c @@ -108,12 +108,12 @@ static void hb_gencc_copyLocals( FILE * yyc, int iLocal1, int iLocal2 ) fprintf( yyc, "\thb_xvmCopyLocals( %d, %d );\n", iLocal1, iLocal2 ); } -static int hb_gencc_checkJumpCondAhead( LONG lValue, PFUNCTION pFunc, ULONG lPCodePos, PHB_LABEL_INFO cargo, +static int hb_gencc_checkJumpCondAhead( HB_LONG lValue, PFUNCTION pFunc, ULONG lPCodePos, PHB_LABEL_INFO cargo, const char * szFunc ) { if( HB_GENC_GETLABEL( lPCodePos + 1 ) == 0 ) { - LONG lOffset = 0; + HB_LONG lOffset = 0; HB_BOOL fNot = HB_FALSE; int iSize = 0; @@ -167,7 +167,7 @@ static int hb_gencc_checkJumpCondAhead( LONG lValue, PFUNCTION pFunc, ULONG lPCo return 1; } -static int hb_gencc_checkNumAhead( LONG lValue, PFUNCTION pFunc, ULONG lPCodePos, PHB_LABEL_INFO cargo ) +static int hb_gencc_checkNumAhead( HB_LONG lValue, PFUNCTION pFunc, ULONG lPCodePos, PHB_LABEL_INFO cargo ) { if( HB_GENC_GETLABEL( lPCodePos ) == 0 ) { @@ -525,7 +525,7 @@ static HB_GENC_FUNC( hb_p_instring ) static HB_GENC_FUNC( hb_p_jumpnear ) { - LONG lOffset = ( signed char ) ( pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = ( signed char ) ( pFunc->pCode[ lPCodePos + 1 ] ); HB_GENC_LABEL(); @@ -536,7 +536,7 @@ static HB_GENC_FUNC( hb_p_jumpnear ) static HB_GENC_FUNC( hb_p_jump ) { - LONG lOffset = HB_PCODE_MKSHORT( &pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = HB_PCODE_MKSHORT( &pFunc->pCode[ lPCodePos + 1 ] ); HB_GENC_LABEL(); @@ -547,7 +547,7 @@ static HB_GENC_FUNC( hb_p_jump ) static HB_GENC_FUNC( hb_p_jumpfar ) { - LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); HB_GENC_LABEL(); @@ -558,7 +558,7 @@ static HB_GENC_FUNC( hb_p_jumpfar ) static HB_GENC_FUNC( hb_p_jumpfalsenear ) { - LONG lOffset = ( signed char ) ( pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = ( signed char ) ( pFunc->pCode[ lPCodePos + 1 ] ); HB_GENC_LABEL(); @@ -569,7 +569,7 @@ static HB_GENC_FUNC( hb_p_jumpfalsenear ) static HB_GENC_FUNC( hb_p_jumpfalse ) { - LONG lOffset = HB_PCODE_MKSHORT( &( pFunc->pCode[ lPCodePos + 1 ] ) ); + HB_LONG lOffset = HB_PCODE_MKSHORT( &( pFunc->pCode[ lPCodePos + 1 ] ) ); HB_GENC_LABEL(); @@ -580,7 +580,7 @@ static HB_GENC_FUNC( hb_p_jumpfalse ) static HB_GENC_FUNC( hb_p_jumpfalsefar ) { - LONG lOffset = HB_PCODE_MKINT24( &( pFunc->pCode[ lPCodePos + 1 ] ) ); + HB_LONG lOffset = HB_PCODE_MKINT24( &( pFunc->pCode[ lPCodePos + 1 ] ) ); HB_GENC_LABEL(); @@ -591,7 +591,7 @@ static HB_GENC_FUNC( hb_p_jumpfalsefar ) static HB_GENC_FUNC( hb_p_jumptruenear ) { - LONG lOffset = ( signed char ) ( pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = ( signed char ) ( pFunc->pCode[ lPCodePos + 1 ] ); HB_GENC_LABEL(); @@ -602,7 +602,7 @@ static HB_GENC_FUNC( hb_p_jumptruenear ) static HB_GENC_FUNC( hb_p_jumptrue ) { - LONG lOffset = HB_PCODE_MKSHORT( &pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = HB_PCODE_MKSHORT( &pFunc->pCode[ lPCodePos + 1 ] ); HB_GENC_LABEL(); @@ -613,7 +613,7 @@ static HB_GENC_FUNC( hb_p_jumptrue ) static HB_GENC_FUNC( hb_p_jumptruefar ) { - LONG lOffset = HB_PCODE_MKINT24( &( pFunc->pCode[ lPCodePos + 1 ] ) ); + HB_LONG lOffset = HB_PCODE_MKINT24( &( pFunc->pCode[ lPCodePos + 1 ] ) ); HB_GENC_LABEL(); @@ -1226,7 +1226,7 @@ static HB_GENC_FUNC( hb_p_pushlocalref ) static HB_GENC_FUNC( hb_p_pushlong ) { - LONG lVal = HB_PCODE_MKLONG( &pFunc->pCode[ lPCodePos + 1 ] ), iSkip; + HB_LONG lVal = HB_PCODE_MKLONG( &pFunc->pCode[ lPCodePos + 1 ] ), iSkip; HB_GENC_LABEL(); @@ -1509,7 +1509,7 @@ static HB_GENC_FUNC( hb_p_seqbegin ) static HB_GENC_FUNC( hb_p_seqend ) { - LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); + HB_LONG lOffset = HB_PCODE_MKINT24( &pFunc->pCode[ lPCodePos + 1 ] ); HB_GENC_LABEL(); diff --git a/harbour/src/compiler/hblbl.c b/harbour/src/compiler/hblbl.c index 40cb8f85fe..4972febcbd 100644 --- a/harbour/src/compiler/hblbl.c +++ b/harbour/src/compiler/hblbl.c @@ -177,7 +177,7 @@ static HB_LABEL_FUNC( hb_p_seqbegin ) static HB_LABEL_FUNC( hb_p_seqend ) { HB_BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ]; - LONG lOffset = HB_PCODE_MKINT24( pAddr ); + HB_LONG lOffset = HB_PCODE_MKINT24( pAddr ); ULONG ulNewPos = lPCodePos + lOffset; if( cargo->fSetSeqBegin || lOffset != 4 ) diff --git a/harbour/src/compiler/hbmain.c b/harbour/src/compiler/hbmain.c index 0cb986e256..97e967e396 100644 --- a/harbour/src/compiler/hbmain.c +++ b/harbour/src/compiler/hbmain.c @@ -1255,7 +1255,7 @@ static void hb_compOptimizeJumps( HB_COMP_DECL ) for( iPass = 0; iPass < 4 && !HB_COMP_PARAM->fExit; ++iPass ) { - LONG lOffset; + HB_LONG lOffset; if( iPass == 3 && fLineStrip ) { @@ -1426,13 +1426,13 @@ static void hb_compOptimizeJumps( HB_COMP_DECL ) if( HB_COMP_PARAM->functions.pLast->iJumps ) { - LONG * plSizes, * plShifts; + HB_LONG * plSizes, * plShifts; ULONG ulSize; pJumps = HB_COMP_PARAM->functions.pLast->pJumps; - ulSize = sizeof( LONG ) * HB_COMP_PARAM->functions.pLast->iJumps; - plSizes = ( LONG * ) hb_xgrab( ulSize ); - plShifts = ( LONG * ) hb_xgrab( ulSize ); + ulSize = sizeof( HB_LONG ) * HB_COMP_PARAM->functions.pLast->iJumps; + plSizes = ( HB_LONG * ) hb_xgrab( ulSize ); + plShifts = ( HB_LONG * ) hb_xgrab( ulSize ); for( iJump = 0; iJump < HB_COMP_PARAM->functions.pLast->iJumps; iJump++ ) plSizes[ iJump ] = plShifts[ iJump ] = 0; @@ -2237,7 +2237,7 @@ static void hb_compPrepareJumps( HB_COMP_DECL ) pFunc->pJumps[ pFunc->iJumps++ ] = ( ULONG ) ( pFunc->lPCodePos - 4 ); } -ULONG hb_compGenJump( LONG lOffset, HB_COMP_DECL ) +ULONG hb_compGenJump( HB_LONG lOffset, HB_COMP_DECL ) { if( !HB_LIM_INT24( lOffset ) ) hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'F', HB_COMP_ERR_JUMP_TOO_LONG, NULL, NULL ); @@ -2248,7 +2248,7 @@ ULONG hb_compGenJump( LONG lOffset, HB_COMP_DECL ) return HB_COMP_PARAM->functions.pLast->lPCodePos - 3; } -ULONG hb_compGenJumpFalse( LONG lOffset, HB_COMP_DECL ) +ULONG hb_compGenJumpFalse( HB_LONG lOffset, HB_COMP_DECL ) { if( !HB_LIM_INT24( lOffset ) ) hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'F', HB_COMP_ERR_JUMP_TOO_LONG, NULL, NULL ); @@ -2259,7 +2259,7 @@ ULONG hb_compGenJumpFalse( LONG lOffset, HB_COMP_DECL ) return HB_COMP_PARAM->functions.pLast->lPCodePos - 3; } -ULONG hb_compGenJumpTrue( LONG lOffset, HB_COMP_DECL ) +ULONG hb_compGenJumpTrue( HB_LONG lOffset, HB_COMP_DECL ) { if( !HB_LIM_INT24( lOffset ) ) hb_compGenError( HB_COMP_PARAM, hb_comp_szErrors, 'F', HB_COMP_ERR_JUMP_TOO_LONG, NULL, NULL ); @@ -2273,7 +2273,7 @@ ULONG hb_compGenJumpTrue( LONG lOffset, HB_COMP_DECL ) void hb_compGenJumpThere( ULONG ulFrom, ULONG ulTo, HB_COMP_DECL ) { HB_BYTE * pCode = HB_COMP_PARAM->functions.pLast->pCode; - LONG lOffset = ulTo - ulFrom + 1; + HB_LONG lOffset = ulTo - ulFrom + 1; if( HB_LIM_INT24( lOffset ) ) { diff --git a/harbour/src/compiler/hbopt.c b/harbour/src/compiler/hbopt.c index 862478fe05..22625b7701 100644 --- a/harbour/src/compiler/hbopt.c +++ b/harbour/src/compiler/hbopt.c @@ -319,7 +319,7 @@ static HB_OPT_FUNC( hb_p_duplicate ) if( pFunc->pCode[ lPCodePos + 5 ] == HB_P_POP ) { HB_BYTE * pAddr = &pFunc->pCode[ lPCodePos + 2 ]; - LONG lOffset = HB_PCODE_MKINT24( pAddr ), lLastOffset = 0; + HB_LONG lOffset = HB_PCODE_MKINT24( pAddr ), lLastOffset = 0; ULONG ulNewPos = lPCodePos + 1 + lOffset; HB_BOOL fNot = HB_FALSE, fOK = HB_TRUE, fRepeat = HB_TRUE; @@ -347,7 +347,7 @@ static HB_OPT_FUNC( hb_p_duplicate ) ( pFunc->pCode[ ulNewPos + 1 ] == HB_P_JUMPTRUEFAR || pFunc->pCode[ ulNewPos + 1 ] == HB_P_JUMPFALSEFAR ) ) { - LONG lJump; + HB_LONG lJump; if( pFunc->pCode[ ulNewPos + 1 ] != pFunc->pCode[ lPCodePos + 1 ] ) fNot = !fNot; lJump = fNot ? 4 : HB_PCODE_MKINT24( &pFunc->pCode[ ulNewPos + 2 ] ); @@ -430,7 +430,7 @@ static HB_OPT_FUNC( hb_p_not ) pFunc->pCode[ lPCodePos + 6 ] == HB_P_POP ) { HB_BYTE * pAddr = &pFunc->pCode[ lPCodePos + 3 ]; - LONG lOffset = HB_PCODE_MKINT24( pAddr ); + HB_LONG lOffset = HB_PCODE_MKINT24( pAddr ); if( lOffset > 0 ) { @@ -477,7 +477,7 @@ static HB_OPT_FUNC( hb_p_not ) static HB_OPT_FUNC( hb_p_jumpfar ) { HB_BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ]; - LONG lOffset = HB_PCODE_MKINT24( pAddr ); + HB_LONG lOffset = HB_PCODE_MKINT24( pAddr ); ULONG ulNewPos = lPCodePos + lOffset; HB_BOOL fLine = HB_FALSE; @@ -532,7 +532,7 @@ static HB_OPT_FUNC( hb_p_jumpfar ) static HB_OPT_FUNC( hb_p_jumpfalsefar ) { HB_BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ]; - LONG lOffset = HB_PCODE_MKINT24( pAddr ); + HB_LONG lOffset = HB_PCODE_MKINT24( pAddr ); ULONG ulNewPos = lPCodePos + lOffset; HB_BOOL fLine = HB_FALSE; @@ -576,7 +576,7 @@ static HB_OPT_FUNC( hb_p_jumpfalsefar ) static HB_OPT_FUNC( hb_p_jumptruefar ) { HB_BYTE * pAddr = &pFunc->pCode[ lPCodePos + 1 ]; - LONG lOffset = HB_PCODE_MKINT24( pAddr ); + HB_LONG lOffset = HB_PCODE_MKINT24( pAddr ); ULONG ulNewPos = lPCodePos + lOffset; HB_BOOL fLine = HB_FALSE; @@ -1011,7 +1011,7 @@ static HB_SHORT hb_compLocalGetNumber( HB_BYTE * pCode ) } -static LONG hb_compJumpGetOffset( HB_BYTE * pCode ) +static HB_LONG hb_compJumpGetOffset( HB_BYTE * pCode ) { switch( *pCode ) { diff --git a/harbour/src/compiler/hbpcode.c b/harbour/src/compiler/hbpcode.c index 2d1649282d..3196853ae8 100644 --- a/harbour/src/compiler/hbpcode.c +++ b/harbour/src/compiler/hbpcode.c @@ -495,7 +495,7 @@ static HB_PCODE_FUNC_PTR s_psize_table[] = LONG hb_compPCodeSize( PFUNCTION pFunc, ULONG ulOffset ) { - LONG lSize = 0; + HB_LONG lSize = 0; HB_BYTE opcode = pFunc->pCode[ ulOffset ]; if( opcode < HB_P_LAST_PCODE ) diff --git a/harbour/src/rdd/dbcmd.c b/harbour/src/rdd/dbcmd.c index 59f2806cf8..aa14fa24e0 100644 --- a/harbour/src/rdd/dbcmd.c +++ b/harbour/src/rdd/dbcmd.c @@ -767,7 +767,7 @@ HB_FUNC( DBSELECTAREA ) } else { - LONG lNewArea = hb_parnl( 1 ); + HB_LONG lNewArea = hb_parnl( 1 ); /* * NOTE: lNewArea >= HB_RDD_MAX_AREA_NUM used intentionally diff --git a/harbour/src/rdd/dbcmdx.c b/harbour/src/rdd/dbcmdx.c index 786d9e7311..0da4cf8ccd 100644 --- a/harbour/src/rdd/dbcmdx.c +++ b/harbour/src/rdd/dbcmdx.c @@ -131,8 +131,8 @@ HB_FUNC( DBSKIPPER ) if( pArea ) { - LONG lSkipped = 0; - LONG lRecs = 1; + HB_LONG lSkipped = 0; + HB_LONG lRecs = 1; HB_BOOL fBEof; ULONG ulRecords = 0; diff --git a/harbour/src/rdd/dbf1.c b/harbour/src/rdd/dbf1.c index b73174f3f3..e62af8e8f5 100644 --- a/harbour/src/rdd/dbf1.c +++ b/harbour/src/rdd/dbf1.c @@ -1461,7 +1461,7 @@ static HB_ERRCODE hb_dbfGoTop( DBFAREAP pArea ) /* * Reposition cursor relative to current position. */ -static HB_ERRCODE hb_dbfSkip( DBFAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_dbfSkip( DBFAREAP pArea, HB_LONG lToSkip ) { HB_ERRCODE errCode; @@ -1505,7 +1505,7 @@ static HB_ERRCODE hb_dbfSkip( DBFAREAP pArea, LONG lToSkip ) /* * Reposition cursor, regardless of filter. */ -static HB_ERRCODE hb_dbfSkipRaw( DBFAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_dbfSkipRaw( DBFAREAP pArea, HB_LONG lToSkip ) { HB_ERRCODE errCode; diff --git a/harbour/src/rdd/dbfcdx/dbfcdx1.c b/harbour/src/rdd/dbfcdx/dbfcdx1.c index f7abb28ae3..1f7785aec2 100644 --- a/harbour/src/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/src/rdd/dbfcdx/dbfcdx1.c @@ -3877,7 +3877,7 @@ static int hb_cdxPageSeekKey( LPCDXPAGE pPage, LPCDXKEY pKey, ULONG ulKeyRec ) */ static HB_BOOL hb_cdxCheckRecordScope( CDXAREAP pArea, ULONG ulRec ) { - LONG lRecNo = ( LONG ) ulRec; + HB_LONG lRecNo = ( HB_LONG ) ulRec; if( SELF_COUNTSCOPE( ( AREAP ) pArea, NULL, &lRecNo ) == HB_SUCCESS && lRecNo == 0 ) { @@ -5211,7 +5211,7 @@ static HB_BOOL hb_cdxCurKeyRefresh( CDXAREAP pArea, LPCDXTAG pTag ) /* * skip to next/previous unique key */ -static HB_ERRCODE hb_cdxDBOISkipUnique( CDXAREAP pArea, LPCDXTAG pTag, LONG lToSkip ) +static HB_ERRCODE hb_cdxDBOISkipUnique( CDXAREAP pArea, LPCDXTAG pTag, HB_LONG lToSkip ) { HB_ERRCODE retval; HB_BOOL fForward; @@ -5742,7 +5742,7 @@ static ULONG hb_cdxDBOIScopeEval( LPCDXTAG pTag, HB_EVALSCOPE_FUNC pFunc, void * /* * return number of keys in order */ -static LONG hb_cdxDBOIKeyCount( CDXAREAP pArea, LPCDXTAG pTag, HB_BOOL fFilters ) +static HB_LONG hb_cdxDBOIKeyCount( CDXAREAP pArea, LPCDXTAG pTag, HB_BOOL fFilters ) { ULONG ulKeyCount = 0; HB_BOOL fLogOpt = pArea->dbfarea.area.dbfi.itmCobExpr || !pArea->dbfarea.area.dbfi.fFilter; @@ -5847,7 +5847,7 @@ static LONG hb_cdxDBOIKeyCount( CDXAREAP pArea, LPCDXTAG pTag, HB_BOOL fFilters /* * return logical key position in order */ -static LONG hb_cdxDBOIKeyNo( CDXAREAP pArea, LPCDXTAG pTag, HB_BOOL fFilters ) +static HB_LONG hb_cdxDBOIKeyNo( CDXAREAP pArea, LPCDXTAG pTag, HB_BOOL fFilters ) { ULONG ulKeyNo = 0; HB_BOOL fLogOpt = pArea->dbfarea.area.dbfi.itmCobExpr || !pArea->dbfarea.area.dbfi.fFilter; @@ -6599,7 +6599,7 @@ static HB_ERRCODE hb_cdxSeek( CDXAREAP pArea, HB_BOOL fSoftSeek, PHB_ITEM pKeyIt } /* ( DBENTRYP_L ) hb_cdxSkip : NULL */ -static HB_ERRCODE hb_cdxSkip( CDXAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_cdxSkip( CDXAREAP pArea, HB_LONG lToSkip ) { LPCDXTAG pTag; ULONG ulPos, ulRec; @@ -6667,7 +6667,7 @@ static HB_ERRCODE hb_cdxSkip( CDXAREAP pArea, LONG lToSkip ) /* ( DBENTRYP_L ) hb_cdxSkipFilter : NULL */ /* ( DBENTRYP_L ) hb_cdxSkipRaw */ -static HB_ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_cdxSkipRaw( CDXAREAP pArea, HB_LONG lToSkip ) { LPCDXTAG pTag; HB_ERRCODE retval; @@ -8612,7 +8612,7 @@ static HB_ERRCODE hb_cdxClearFilter( CDXAREAP pArea ) /* ( DBENTRYP_V ) hb_cdxClearScope : NULL */ /* ( DBENTRYP_VPLP ) hb_cdxCountScope */ -static HB_ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, LONG * plRec ) +static HB_ERRCODE hb_cdxCountScope( CDXAREAP pArea, void * pPtr, HB_LONG * plRec ) { HB_TRACE(HB_TR_DEBUG, ("hb_cdxCountScope(%p, %p, %p)", pArea, pPtr, plRec)); @@ -8730,12 +8730,12 @@ static int hb_cdxQuickSortCompare( LPCDXSORTINFO pSort, HB_BYTE * pKey1, HB_BYTE return i; } -static HB_BOOL hb_cdxQSort( LPCDXSORTINFO pSort, HB_BYTE * pSrc, HB_BYTE * pBuf, LONG lKeys ) +static HB_BOOL hb_cdxQSort( LPCDXSORTINFO pSort, HB_BYTE * pSrc, HB_BYTE * pBuf, HB_LONG lKeys ) { if( lKeys > 1 ) { int iLen = pSort->keyLen + 4; - LONG l1, l2; + HB_LONG l1, l2; HB_BYTE * pPtr1, * pPtr2, *pDst; HB_BOOL f1, f2; @@ -8968,7 +8968,7 @@ static void hb_cdxSortGetPageKey( LPCDXSORTINFO pSort, ULONG ulPage, static void hb_cdxSortOrderPages( LPCDXSORTINFO pSort ) { int iLen = pSort->keyLen, i; - LONG l, r, m; + HB_LONG l, r, m; ULONG n, ulPage, ulRec; HB_BYTE *pKey = NULL, *pTmp; @@ -9006,7 +9006,7 @@ static void hb_cdxSortOrderPages( LPCDXSORTINFO pSort ) static HB_BOOL hb_cdxSortKeyGet( LPCDXSORTINFO pSort, HB_BYTE ** pKeyVal, ULONG *pulRec ) { int iLen = pSort->keyLen, i; - LONG l, r, m; + HB_LONG l, r, m; ULONG ulPage; ulPage = pSort->pSortedPages[ pSort->ulFirst ]; @@ -9043,7 +9043,7 @@ static HB_BOOL hb_cdxSortKeyGet( LPCDXSORTINFO pSort, HB_BYTE ** pKeyVal, ULONG else r = m - 1; } - if( l > ( LONG ) pSort->ulFirst + 1 ) + if( l > ( HB_LONG ) pSort->ulFirst + 1 ) { ulPage = pSort->pSortedPages[ pSort->ulFirst ]; for( r = pSort->ulFirst + 1; r < l; r++ ) @@ -9367,7 +9367,7 @@ static void hb_cdxTagDoIndex( LPCDXTAG pTag, HB_BOOL fReindex ) LPCDXSORTINFO pSort; PHB_ITEM pForItem, pWhileItem = NULL, pEvalItem = NULL, pItem = NULL; ULONG ulRecCount, ulRecNo = pArea->dbfarea.ulRecNo; - LONG lStep = 0; + HB_LONG lStep = 0; PHB_CODEPAGE cdpTmp = hb_cdpSelect( pArea->dbfarea.area.cdPage ); if( pArea->dbfarea.area.lpdbOrdCondInfo ) diff --git a/harbour/src/rdd/dbffpt/dbffpt1.c b/harbour/src/rdd/dbffpt/dbffpt1.c index 4c45bbf083..bcd7ac8fc0 100644 --- a/harbour/src/rdd/dbffpt/dbffpt1.c +++ b/harbour/src/rdd/dbffpt/dbffpt1.c @@ -1239,7 +1239,7 @@ static ULONG hb_fptStoreSMTItem( FPTAREAP pArea, PHB_ITEM pItem, HB_BYTE ** bBuf { ULONG ulLen, u, ulSize = 0; HB_MAXINT iVal; - LONG lVal; + HB_LONG lVal; double dVal; int iWidth, iDec; @@ -1384,7 +1384,7 @@ static HB_ERRCODE hb_fptReadRawSMTItem( FPTAREAP pArea, PHB_ITEM pItem, HB_FOFFS if( hb_fileReadAt( pArea->pMemoFile, buffer, 4, *pfOffset ) != 4 ) return EDBF_READ; *pfOffset += 4; - hb_itemPutNInt( pItem, ( LONG ) HB_GET_LE_UINT32( buffer ) ); + hb_itemPutNInt( pItem, ( HB_LONG ) HB_GET_LE_UINT32( buffer ) ); break; case SMT_IT_DOUBLE: @@ -1445,7 +1445,7 @@ static HB_ERRCODE hb_fptReadSMTItem( FPTAREAP pArea, HB_BYTE ** pbMemoBuf, HB_BY } ulLen = HB_GET_LE_UINT16( *pbMemoBuf ); *pbMemoBuf += 2; - if( bBufEnd - (*pbMemoBuf) < ( LONG ) ulLen ) + if( bBufEnd - (*pbMemoBuf) < ( HB_LONG ) ulLen ) { errCode = EDBF_CORRUPT; break; @@ -1468,7 +1468,7 @@ static HB_ERRCODE hb_fptReadSMTItem( FPTAREAP pArea, HB_BYTE ** pbMemoBuf, HB_BY } ulLen = HB_GET_LE_UINT16( *pbMemoBuf ); *pbMemoBuf += 2; - if( bBufEnd - (*pbMemoBuf) < ( LONG ) ulLen ) + if( bBufEnd - (*pbMemoBuf) < ( HB_LONG ) ulLen ) { errCode = EDBF_CORRUPT; } @@ -1492,7 +1492,7 @@ static HB_ERRCODE hb_fptReadSMTItem( FPTAREAP pArea, HB_BYTE ** pbMemoBuf, HB_BY errCode = EDBF_CORRUPT; break; } - hb_itemPutNInt( pItem, ( LONG ) HB_GET_LE_UINT32( *pbMemoBuf ) ); + hb_itemPutNInt( pItem, ( HB_LONG ) HB_GET_LE_UINT32( *pbMemoBuf ) ); *pbMemoBuf += 4; break; @@ -1608,7 +1608,7 @@ static ULONG hb_fptStoreSixItem( FPTAREAP pArea, PHB_ITEM pItem, HB_BYTE ** bBuf { ULONG ulLen, u, ulSize; HB_MAXINT iVal; - LONG lVal; + HB_LONG lVal; double dVal; int iWidth, iDec; @@ -1721,7 +1721,7 @@ static HB_ERRCODE hb_fptReadSixItem( FPTAREAP pArea, HB_BYTE ** pbMemoBuf, HB_BY HB_ERRCODE errCode = HB_SUCCESS; ulLen = SIX_ITEM_BUFSIZE; - if( bBufEnd - (*pbMemoBuf) >= ( LONG ) ulLen ) + if( bBufEnd - (*pbMemoBuf) >= ( HB_LONG ) ulLen ) { usType = HB_GET_LE_UINT16( &(*pbMemoBuf)[0] ); switch ( usType ) @@ -1751,7 +1751,7 @@ static HB_ERRCODE hb_fptReadSixItem( FPTAREAP pArea, HB_BYTE ** pbMemoBuf, HB_BY ulLen &= 0xFFFF; /* only 2 bytes (HB_SHORT) for SIX compatibility */ } (*pbMemoBuf) += SIX_ITEM_BUFSIZE; - if( bBufEnd - (*pbMemoBuf) >= ( LONG ) ulLen ) + if( bBufEnd - (*pbMemoBuf) >= ( HB_LONG ) ulLen ) { char * pszStr = ( char * ) ( *pbMemoBuf ); if( fTrans && ulLen > 0 ) @@ -1873,7 +1873,7 @@ static void hb_fptStoreFlexItem( FPTAREAP pArea, PHB_ITEM pItem, HB_BYTE ** bBuf { ULONG ulLen, u; HB_MAXINT iVal; - LONG lVal; + HB_LONG lVal; double dVal; int iWidth, iDec; @@ -2214,7 +2214,7 @@ static HB_ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, HB_BYTE ** pbMemoBuf, HB_B case FPTIT_FLEXAR_LONG1: if( bBufEnd - (*pbMemoBuf) >= 5 ) { - hb_itemPutNLLen( pItem, ( LONG ) HB_GET_LE_UINT32( *pbMemoBuf ), + hb_itemPutNLLen( pItem, ( HB_LONG ) HB_GET_LE_UINT32( *pbMemoBuf ), (*pbMemoBuf)[4] ); *pbMemoBuf += 5; } @@ -2230,11 +2230,11 @@ static HB_ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, HB_BYTE ** pbMemoBuf, HB_B if( iDec ) { iLen -= iDec + 1; - hb_itemPutNDLen( pItem, ( LONG ) HB_GET_LE_UINT32( *pbMemoBuf ), iLen, iDec ); + hb_itemPutNDLen( pItem, ( HB_LONG ) HB_GET_LE_UINT32( *pbMemoBuf ), iLen, iDec ); } else { - hb_itemPutNLLen( pItem, ( LONG ) HB_GET_LE_UINT32( *pbMemoBuf ), iLen ); + hb_itemPutNLLen( pItem, ( HB_LONG ) HB_GET_LE_UINT32( *pbMemoBuf ), iLen ); } *pbMemoBuf += 6; } @@ -2310,7 +2310,7 @@ static HB_ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, HB_BYTE ** pbMemoBuf, HB_B { ulLen = HB_GET_LE_UINT16( *pbMemoBuf ); *pbMemoBuf += 2; - if( bBufEnd - (*pbMemoBuf) >= ( LONG ) ulLen ) + if( bBufEnd - (*pbMemoBuf) >= ( HB_LONG ) ulLen ) { char * pszStr = ( char * ) ( *pbMemoBuf ); *pbMemoBuf += ulLen; @@ -2338,7 +2338,7 @@ static HB_ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, HB_BYTE ** pbMemoBuf, HB_B { ulLen = HB_GET_LE_UINT16( *pbMemoBuf ); *pbMemoBuf += 2; - if( bBufEnd - (*pbMemoBuf) >= ( LONG ) ulLen ) + if( bBufEnd - (*pbMemoBuf) >= ( HB_LONG ) ulLen ) { hb_arrayNew( pItem, ulLen ); for( i = 1; i <= ulLen; i++ ) @@ -2926,7 +2926,7 @@ static HB_ERRCODE hb_fptPutMemo( FPTAREAP pArea, HB_USHORT uiIndex, PHB_ITEM pIt HB_BYTE *bBufPtr = NULL, *bBufAlloc = NULL; HB_ERRCODE errCode; HB_MAXINT iVal; - LONG lVal; + HB_LONG lVal; HB_TRACE(HB_TR_DEBUG, ("hb_fptPutMemo(%p, %hu, %p, %p)", pArea, uiIndex, pItem, pulBlock)); @@ -4449,7 +4449,7 @@ static HB_ERRCODE hb_fptDoPackRec( FPTAREAP pArea ) } static HB_ERRCODE hb_fptDoPack( FPTAREAP pArea, HB_USHORT uiBlockSize, - PHB_ITEM pEvalBlock, LONG lEvalStep ) + PHB_ITEM pEvalBlock, HB_LONG lEvalStep ) { HB_ERRCODE errCode = HB_SUCCESS; @@ -4465,7 +4465,7 @@ static HB_ERRCODE hb_fptDoPack( FPTAREAP pArea, HB_USHORT uiBlockSize, { char szFile[ HB_PATH_MAX ]; ULONG ulRecNo, ulRecords; - LONG lStep = lEvalStep; + HB_LONG lStep = lEvalStep; if( pEvalBlock && !HB_IS_BLOCK( pEvalBlock ) ) pEvalBlock = NULL; diff --git a/harbour/src/rdd/dbfnsx/dbfnsx1.c b/harbour/src/rdd/dbfnsx/dbfnsx1.c index f808644c78..b2cddce0b9 100644 --- a/harbour/src/rdd/dbfnsx/dbfnsx1.c +++ b/harbour/src/rdd/dbfnsx/dbfnsx1.c @@ -1071,7 +1071,7 @@ static void hb_nsxTagRefreshScope( LPTAGINFO pTag ) */ static HB_BOOL hb_nsxCheckRecordScope( NSXAREAP pArea, ULONG ulRec ) { - LONG lRecNo = ( LONG ) ulRec; + HB_LONG lRecNo = ( HB_LONG ) ulRec; if( SELF_COUNTSCOPE( ( AREAP ) pArea, NULL, &lRecNo ) == HB_SUCCESS && lRecNo == 0 ) { @@ -4415,7 +4415,7 @@ static void hb_nsxOrdSetRelKeyPos( LPTAGINFO pTag, double dPos ) /* * skip to next/previous unique key */ -static HB_BOOL hb_nsxOrdSkipUnique( LPTAGINFO pTag, LONG lToSkip ) +static HB_BOOL hb_nsxOrdSkipUnique( LPTAGINFO pTag, HB_LONG lToSkip ) { NSXAREAP pArea = pTag->pIndex->pArea; HB_BOOL fOut = HB_FALSE, fEof = HB_FALSE, fForward = ( lToSkip >= 0 ); @@ -4989,12 +4989,12 @@ static int hb_nsxQuickSortCompare( LPNSXSORTINFO pSort, HB_UCHAR * pKey1, HB_UCH return i; } -static HB_BOOL hb_nsxQSort( LPNSXSORTINFO pSort, HB_UCHAR * pSrc, HB_UCHAR * pBuf, LONG lKeys ) +static HB_BOOL hb_nsxQSort( LPNSXSORTINFO pSort, HB_UCHAR * pSrc, HB_UCHAR * pBuf, HB_LONG lKeys ) { if( lKeys > 1 ) { int iLen = pSort->keyLen + 4; - LONG l1, l2; + HB_LONG l1, l2; HB_UCHAR * pPtr1, * pPtr2, *pDst; HB_BOOL f1, f2; @@ -5248,7 +5248,7 @@ static void hb_nsxSortGetPageKey( LPNSXSORTINFO pSort, ULONG ulPage, static void hb_nsxSortOrderPages( LPNSXSORTINFO pSort ) { int iLen = pSort->keyLen, i; - LONG l, r, m; + HB_LONG l, r, m; ULONG n, ulPage, ulRec; HB_UCHAR *pKey = NULL, *pTmp; @@ -5286,7 +5286,7 @@ static void hb_nsxSortOrderPages( LPNSXSORTINFO pSort ) static HB_BOOL hb_nsxSortKeyGet( LPNSXSORTINFO pSort, HB_UCHAR ** pKeyVal, ULONG *pulRec ) { int iLen = pSort->keyLen, i; - LONG l, r, m; + HB_LONG l, r, m; ULONG ulPage; ulPage = pSort->pSortedPages[ pSort->ulFirst ]; @@ -5322,7 +5322,7 @@ static HB_BOOL hb_nsxSortKeyGet( LPNSXSORTINFO pSort, HB_UCHAR ** pKeyVal, ULONG else r = m - 1; } - if( l > ( LONG ) pSort->ulFirst + 1 ) + if( l > ( HB_LONG ) pSort->ulFirst + 1 ) { ulPage = pSort->pSortedPages[ pSort->ulFirst ]; for( r = pSort->ulFirst + 1; r < l; r++ ) @@ -5736,7 +5736,7 @@ static HB_ERRCODE hb_nsxTagCreate( LPTAGINFO pTag, HB_BOOL fReindex ) PHB_ITEM pForItem, pWhileItem = NULL, pEvalItem = NULL, pItem = NULL; ULONG ulRecCount, ulRecNo = pArea->dbfarea.ulRecNo; LPNSXSORTINFO pSort; - LONG lStep = 0; + HB_LONG lStep = 0; HB_ERRCODE errCode = HB_SUCCESS; if( pArea->dbfarea.area.lpdbOrdCondInfo ) @@ -6201,7 +6201,7 @@ static HB_ERRCODE hb_nsxSeek( NSXAREAP pArea, HB_BOOL fSoftSeek, PHB_ITEM pItem, } } -static HB_ERRCODE hb_nsxSkipRaw( NSXAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_nsxSkipRaw( NSXAREAP pArea, HB_LONG lToSkip ) { HB_ERRCODE retval; HB_BOOL fOut = HB_FALSE, fForward; @@ -7723,7 +7723,7 @@ static HB_ERRCODE hb_nsxOrderInfo( NSXAREAP pArea, HB_USHORT uiIndex, LPDBORDERI return HB_SUCCESS; } -static HB_ERRCODE hb_nsxCountScope( NSXAREAP pArea, void * pPtr, LONG * plRecNo ) +static HB_ERRCODE hb_nsxCountScope( NSXAREAP pArea, void * pPtr, HB_LONG * plRecNo ) { HB_TRACE(HB_TR_DEBUG, ("hb_nsxCountScope(%p, %p, %p)", pArea, pPtr, plRecNo)); diff --git a/harbour/src/rdd/dbfntx/dbfntx1.c b/harbour/src/rdd/dbfntx/dbfntx1.c index d0680f338f..c4eca2ffb7 100644 --- a/harbour/src/rdd/dbfntx/dbfntx1.c +++ b/harbour/src/rdd/dbfntx/dbfntx1.c @@ -876,7 +876,7 @@ static void hb_ntxTagRefreshScope( LPTAGINFO pTag ) */ static HB_BOOL hb_ntxCheckRecordScope( NTXAREAP pArea, ULONG ulRec ) { - LONG lRecNo = ( LONG ) ulRec; + HB_LONG lRecNo = ( HB_LONG ) ulRec; if( SELF_COUNTSCOPE( ( AREAP ) pArea, NULL, &lRecNo ) == HB_SUCCESS && lRecNo == 0 ) { @@ -4049,7 +4049,7 @@ static void hb_ntxOrdSetRelKeyPos( LPTAGINFO pTag, double dPos ) /* * skip to next/previous unique key */ -static HB_BOOL hb_ntxOrdSkipUnique( LPTAGINFO pTag, LONG lToSkip ) +static HB_BOOL hb_ntxOrdSkipUnique( LPTAGINFO pTag, HB_LONG lToSkip ) { NTXAREAP pArea = pTag->Owner->Owner; HB_BOOL fOut = HB_FALSE, fEof = HB_FALSE, fForward = ( lToSkip >= 0 ); @@ -4620,12 +4620,12 @@ static int hb_ntxQuickSortCompare( LPNTXSORTINFO pSort, HB_BYTE * pKey1, HB_BYTE return i; } -static HB_BOOL hb_ntxQSort( LPNTXSORTINFO pSort, HB_BYTE * pSrc, HB_BYTE * pBuf, LONG lKeys ) +static HB_BOOL hb_ntxQSort( LPNTXSORTINFO pSort, HB_BYTE * pSrc, HB_BYTE * pBuf, HB_LONG lKeys ) { if( lKeys > 1 ) { int iLen = pSort->keyLen + 4; - LONG l1, l2; + HB_LONG l1, l2; HB_BYTE * pPtr1, * pPtr2, *pDst; HB_BOOL f1, f2; @@ -4831,7 +4831,7 @@ static void hb_ntxSortGetPageKey( LPNTXSORTINFO pSort, ULONG ulPage, static void hb_ntxSortOrderPages( LPNTXSORTINFO pSort ) { int iLen = pSort->keyLen, i; - LONG l, r, m; + HB_LONG l, r, m; ULONG n, ulPage, ulRec; HB_BYTE *pKey = NULL, *pTmp; @@ -4874,7 +4874,7 @@ static void hb_ntxSortOrderPages( LPNTXSORTINFO pSort ) static HB_BOOL hb_ntxSortKeyGet( LPNTXSORTINFO pSort, HB_BYTE ** pKeyVal, ULONG *pulRec ) { int iLen = pSort->keyLen, i; - LONG l, r, m; + HB_LONG l, r, m; ULONG ulPage; ulPage = pSort->pSortedPages[ pSort->ulFirst ]; @@ -4917,7 +4917,7 @@ static HB_BOOL hb_ntxSortKeyGet( LPNTXSORTINFO pSort, HB_BYTE ** pKeyVal, ULONG else r = m - 1; } - if( l > ( LONG ) pSort->ulFirst + 1 ) + if( l > ( HB_LONG ) pSort->ulFirst + 1 ) { ulPage = pSort->pSortedPages[ pSort->ulFirst ]; for( r = pSort->ulFirst + 1; r < l; r++ ) @@ -5269,7 +5269,7 @@ static HB_ERRCODE hb_ntxTagCreate( LPTAGINFO pTag, HB_BOOL fReindex ) PHB_ITEM pForItem, pWhileItem = NULL, pEvalItem = NULL, pItem = NULL; ULONG ulRecCount, ulRecNo = pArea->dbfarea.ulRecNo; LPNTXSORTINFO pSort; - LONG lStep = 0; + HB_LONG lStep = 0; HB_ERRCODE errCode = HB_SUCCESS; if( pArea->dbfarea.area.lpdbOrdCondInfo ) @@ -5731,7 +5731,7 @@ static HB_ERRCODE hb_ntxSeek( NTXAREAP pArea, HB_BOOL fSoftSeek, PHB_ITEM pItem, #define hb_ntxSkip NULL #define hb_ntxSkipFilter NULL -static HB_ERRCODE hb_ntxSkipRaw( NTXAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_ntxSkipRaw( NTXAREAP pArea, HB_LONG lToSkip ) { HB_ERRCODE retval; HB_BOOL fOut = HB_FALSE, fForward; @@ -7590,7 +7590,7 @@ static HB_ERRCODE hb_ntxOrderListRebuild( NTXAREAP pArea ) #define hb_ntxClearLocate NULL #define hb_ntxClearScope NULL -static HB_ERRCODE hb_ntxCountScope( NTXAREAP pArea, void * pPtr, LONG * plRecNo ) +static HB_ERRCODE hb_ntxCountScope( NTXAREAP pArea, void * pPtr, HB_LONG * plRecNo ) { HB_TRACE(HB_TR_DEBUG, ("hb_ntxCountScope(%p, %p, %p)", pArea, pPtr, plRecNo)); diff --git a/harbour/src/rdd/delim1.c b/harbour/src/rdd/delim1.c index 203675d154..825a0456c2 100644 --- a/harbour/src/rdd/delim1.c +++ b/harbour/src/rdd/delim1.c @@ -419,7 +419,7 @@ static HB_ERRCODE hb_delimGoTop( DELIMAREAP pArea ) /* * Reposition cursor, regardless of filter. */ -static HB_ERRCODE hb_delimSkipRaw( DELIMAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_delimSkipRaw( DELIMAREAP pArea, HB_LONG lToSkip ) { HB_TRACE(HB_TR_DEBUG, ("hb_delimSkipRaw(%p,%ld)", pArea, lToSkip)); diff --git a/harbour/src/rdd/hbsix/sxord.c b/harbour/src/rdd/hbsix/sxord.c index 43a245b994..7c70db1013 100644 --- a/harbour/src/rdd/hbsix/sxord.c +++ b/harbour/src/rdd/hbsix/sxord.c @@ -348,7 +348,7 @@ HB_FUNC( SX_ISREINDEX ) HB_FUNC( SX_STEP ) { AREAP pArea = ( AREAP ) hb_rddGetCurrentWorkAreaPointer(); - LONG lStep = 0; + HB_LONG lStep = 0; if( pArea ) { diff --git a/harbour/src/rdd/sdf1.c b/harbour/src/rdd/sdf1.c index 25cc711885..ff0a6ecfc4 100644 --- a/harbour/src/rdd/sdf1.c +++ b/harbour/src/rdd/sdf1.c @@ -244,7 +244,7 @@ static HB_ERRCODE hb_sdfGoTop( SDFAREAP pArea ) /* * Reposition cursor, regardless of filter. */ -static HB_ERRCODE hb_sdfSkipRaw( SDFAREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_sdfSkipRaw( SDFAREAP pArea, HB_LONG lToSkip ) { HB_TRACE(HB_TR_DEBUG, ("hb_sdfSkipRaw(%p,%ld)", pArea, lToSkip)); diff --git a/harbour/src/rdd/usrrdd/usrrdd.c b/harbour/src/rdd/usrrdd/usrrdd.c index 6706141068..3b77c359c3 100644 --- a/harbour/src/rdd/usrrdd/usrrdd.c +++ b/harbour/src/rdd/usrrdd/usrrdd.c @@ -885,7 +885,7 @@ static HB_ERRCODE hb_usrStructSize( AREAP pArea, HB_USHORT * puiSize ) static HB_ERRCODE hb_usrSysName( AREAP pArea, char * szSysName ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrSysName(%p,%p)", pArea, szSysName)); @@ -953,7 +953,7 @@ static HB_ERRCODE hb_usrRelease( AREAP pArea ) static HB_ERRCODE hb_usrBof( AREAP pArea, HB_BOOL * pBof ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrBof(%p, %p)", pArea, pBof)); @@ -980,7 +980,7 @@ static HB_ERRCODE hb_usrBof( AREAP pArea, HB_BOOL * pBof ) static HB_ERRCODE hb_usrEof( AREAP pArea, HB_BOOL * pEof ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrEof(%p, %p)", pArea, pEof)); @@ -1007,7 +1007,7 @@ static HB_ERRCODE hb_usrEof( AREAP pArea, HB_BOOL * pEof ) static HB_ERRCODE hb_usrFound( AREAP pArea, HB_BOOL * pFound ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrFound(%p, %p)", pArea, pFound)); @@ -1102,7 +1102,7 @@ static HB_ERRCODE hb_usrSeek( AREAP pArea, HB_BOOL fSoftSeek, PHB_ITEM pItem, HB return hb_usrReturn(); } -static HB_ERRCODE hb_usrSkip( AREAP pArea, LONG lRecords ) +static HB_ERRCODE hb_usrSkip( AREAP pArea, HB_LONG lRecords ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrSkip(%p,%ld)", pArea, lRecords)); @@ -1116,7 +1116,7 @@ static HB_ERRCODE hb_usrSkip( AREAP pArea, LONG lRecords ) return hb_usrReturn(); } -static HB_ERRCODE hb_usrSkipFilter( AREAP pArea, LONG lDirect ) +static HB_ERRCODE hb_usrSkipFilter( AREAP pArea, HB_LONG lDirect ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrSkipFilter(%p,%ld)", pArea, lDirect)); @@ -1130,7 +1130,7 @@ static HB_ERRCODE hb_usrSkipFilter( AREAP pArea, LONG lDirect ) return hb_usrReturn(); } -static HB_ERRCODE hb_usrSkipRaw( AREAP pArea, LONG lRecords ) +static HB_ERRCODE hb_usrSkipRaw( AREAP pArea, HB_LONG lRecords ) { HB_TRACE(HB_TR_DEBUG, ("hb_usrSkipRaw(%p,%ld)", pArea, lRecords)); @@ -1151,7 +1151,7 @@ static HB_ERRCODE hb_usrSkipRaw( AREAP pArea, LONG lRecords ) static HB_ERRCODE hb_usrDeleted( AREAP pArea, HB_BOOL * pDeleted ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrDeleted(%p, %p)", pArea, pDeleted)); @@ -1215,7 +1215,7 @@ static HB_ERRCODE hb_usrFieldDisplay( AREAP pArea, LPDBFIELDINFO pFieldInfo ) static HB_ERRCODE hb_usrFieldName( AREAP pArea, HB_USHORT uiIndex, char * szName ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrFieldName(%p,%hu,%p)", pArea, uiIndex, szName)); @@ -1281,7 +1281,7 @@ static HB_ERRCODE hb_usrRecall( AREAP pArea ) static HB_ERRCODE hb_usrFieldCount( AREAP pArea, HB_USHORT * puiFields ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrFieldCount(%p,%p)", pArea, puiFields)); @@ -1359,7 +1359,7 @@ static HB_ERRCODE hb_usrPutRec( AREAP pArea, const HB_BYTE * pBuffer ) static HB_ERRCODE hb_usrGetRec( AREAP pArea, HB_BYTE ** pBuffer ) { PHB_ITEM pItem; - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrGetRec(%p,%p)", pArea, pBuffer)); @@ -1417,7 +1417,7 @@ static HB_ERRCODE hb_usrPutValue( AREAP pArea, HB_USHORT uiIndex, PHB_ITEM pItem static HB_ERRCODE hb_usrGetVarLen( AREAP pArea, HB_USHORT uiIndex, ULONG * pulLength ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrGetVarLen(%p,%hu,%p)", pArea, uiIndex, pulLength)); @@ -1442,7 +1442,7 @@ static HB_ERRCODE hb_usrGetVarLen( AREAP pArea, HB_USHORT uiIndex, ULONG * pulLe static HB_ERRCODE hb_usrRecCount( AREAP pArea, ULONG * pulRecCount ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrRecCount(%p,%p)", pArea, pulRecCount)); @@ -1482,7 +1482,7 @@ static HB_ERRCODE hb_usrRecInfo( AREAP pArea, PHB_ITEM pRecID, HB_USHORT uiInfoT static HB_ERRCODE hb_usrRecNo( AREAP pArea, ULONG * pulRecNo ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrRecNo(%p,%p)", pArea, pulRecNo)); @@ -1569,7 +1569,7 @@ static HB_ERRCODE hb_usrSetFieldExtent( AREAP pArea, HB_USHORT uiFieldExtent ) static HB_ERRCODE hb_usrAlias( AREAP pArea, char * szAlias ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrAlias(%p,%p)", pArea, szAlias)); @@ -1692,7 +1692,7 @@ static HB_ERRCODE hb_usrPack( AREAP pArea ) static HB_ERRCODE hb_usrPackRec( AREAP pArea, ULONG ulRecNo, HB_BOOL * pWritten ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrPackRec(%p,%lu,%p)", pArea, ulRecNo, pWritten)); @@ -1890,7 +1890,7 @@ static HB_ERRCODE hb_usrForceRel( AREAP pArea ) static HB_ERRCODE hb_usrRelArea( AREAP pArea, HB_USHORT uiRelNo, HB_USHORT * puiRelArea ) { - LONG lOffset; + HB_LONG lOffset; HB_TRACE(HB_TR_DEBUG, ("hb_usrRelArea(%p,%hu,%p)", pArea, uiRelNo, puiRelArea)); diff --git a/harbour/src/rdd/workarea.c b/harbour/src/rdd/workarea.c index dbb72efab5..1bb8ee7f50 100644 --- a/harbour/src/rdd/workarea.c +++ b/harbour/src/rdd/workarea.c @@ -105,9 +105,9 @@ static HB_ERRCODE hb_waFound( AREAP pArea, HB_BOOL * pFound ) /* * Reposition cursor relative to current position. */ -static HB_ERRCODE hb_waSkip( AREAP pArea, LONG lToSkip ) +static HB_ERRCODE hb_waSkip( AREAP pArea, HB_LONG lToSkip ) { - LONG lSkip; + HB_LONG lSkip; HB_TRACE(HB_TR_DEBUG, ("hb_waSkip(%p, %ld)", pArea, lToSkip)); @@ -146,7 +146,7 @@ static HB_ERRCODE hb_waSkip( AREAP pArea, LONG lToSkip ) /* * Reposition cursor respecting any filter setting. */ -static HB_ERRCODE hb_waSkipFilter( AREAP pArea, LONG lUpDown ) +static HB_ERRCODE hb_waSkipFilter( AREAP pArea, HB_LONG lUpDown ) { HB_BOOL fBottom, fDeleted; HB_ERRCODE errCode; @@ -958,7 +958,7 @@ static HB_ERRCODE hb_waSysName( AREAP pArea, char * pBuffer ) */ static HB_ERRCODE hb_waEval( AREAP pArea, LPDBEVALINFO pEvalInfo ) { - LONG lNext = 1; + HB_LONG lNext = 1; HB_BOOL fEof, fFor; HB_TRACE(HB_TR_DEBUG, ("hb_waEval(%p, %p)", pArea, pEvalInfo)); @@ -1030,7 +1030,7 @@ static HB_ERRCODE hb_waEval( AREAP pArea, LPDBEVALINFO pEvalInfo ) */ static HB_ERRCODE hb_waLocate( AREAP pArea, HB_BOOL fContinue ) { - LONG lNext = 1; + HB_LONG lNext = 1; HB_BOOL fEof; HB_TRACE(HB_TR_DEBUG, ("hb_waLocate(%p, %d)", pArea, fContinue)); @@ -1115,7 +1115,7 @@ static HB_ERRCODE hb_waLocate( AREAP pArea, HB_BOOL fContinue ) */ static HB_ERRCODE hb_waTrans( AREAP pArea, LPDBTRANSINFO pTransInfo ) { - LONG lNext = 1; + HB_LONG lNext = 1; HB_BOOL fEof, fFor; HB_TRACE(HB_TR_DEBUG, ("hb_waTrans(%p, %p)", pArea, pTransInfo)); @@ -2219,10 +2219,8 @@ HB_ERRCODE hb_rddInherit( RDDFUNCS * pTable, const RDDFUNCS * pSubTable, RDDFUNC hb_strncpyUpper( szSuperName, szDrvName, sizeof( szSuperName ) - 1 ); pRddNode = hb_rddFindNode( szSuperName, NULL ); - if( !pRddNode ) - { + if( ! pRddNode ) return HB_FAILURE; - } memcpy( pTable, &pRddNode->pTable, sizeof( RDDFUNCS ) ); memcpy( pSuperTable, &pRddNode->pTable, sizeof( RDDFUNCS ) ); @@ -2248,11 +2246,11 @@ HB_ERRCODE hb_rddInherit( RDDFUNCS * pTable, const RDDFUNCS * pSubTable, RDDFUNC */ HB_FUNC( __RDDPREALLOCATE ) { - LONG lNewSize = hb_parnl( 1 ); + HB_LONG lNewSize = hb_parnl( 1 ); - if( lNewSize > ( LONG ) USHRT_MAX ) + if( lNewSize > ( HB_LONG ) USHRT_MAX ) lNewSize = USHRT_MAX; - if( lNewSize > ( LONG ) s_uiRddMax ) + if( lNewSize > ( HB_LONG ) s_uiRddMax ) { s_uiRddMax += HB_RDD_POOL_ALLOCSIZE; s_RddList = ( LPRDDNODE * ) diff --git a/harbour/src/vm/arrays.c b/harbour/src/vm/arrays.c index 19ab904946..55f9041171 100644 --- a/harbour/src/vm/arrays.c +++ b/harbour/src/vm/arrays.c @@ -1544,7 +1544,7 @@ PHB_ITEM hb_arrayFromParams( int iLevel ) HB_STACK_TLS_PRELOAD PHB_ITEM pArray; HB_USHORT uiPos, uiPCount; - LONG lBaseOffset; + HB_LONG lBaseOffset; HB_TRACE(HB_TR_DEBUG, ("hb_arrayFromParams(%d)", iLevel)); diff --git a/harbour/src/vm/classes.c b/harbour/src/vm/classes.c index 92f6a66016..cee60e4d7d 100644 --- a/harbour/src/vm/classes.c +++ b/harbour/src/vm/classes.c @@ -1482,9 +1482,9 @@ const char * hb_objGetRealClsName( PHB_ITEM pObject, const char * szName ) } #if defined( HB_CLASSY_BLOCK_SCOPE ) -static LONG hb_clsSenderOffset( void ) +static HB_LONG hb_clsSenderOffset( void ) { - LONG lOffset = hb_stackBaseProcOffset( 1 ); + HB_LONG lOffset = hb_stackBaseProcOffset( 1 ); if( lOffset > 0 ) { @@ -1510,7 +1510,7 @@ static LONG hb_clsSenderOffset( void ) #if 0 static HB_USHORT hb_clsSenderClasss( void ) { - LONG lOffset = hb_clsSenderOffset(); + HB_LONG lOffset = hb_clsSenderOffset(); if( lOffset > 0 ) return hb_stackItem( lOffset )->item.asSymbol.stackstate->uiClass; @@ -1521,7 +1521,7 @@ static HB_USHORT hb_clsSenderClasss( void ) static HB_USHORT hb_clsSenderMethodClasss( void ) { - LONG lOffset = hb_clsSenderOffset(); + HB_LONG lOffset = hb_clsSenderOffset(); if( lOffset > 0 ) { @@ -1538,7 +1538,7 @@ static HB_USHORT hb_clsSenderMethodClasss( void ) static PHB_SYMB hb_clsSenderSymbol( void ) { PHB_SYMB pSym = NULL; - LONG lOffset = hb_clsSenderOffset(); + HB_LONG lOffset = hb_clsSenderOffset(); if( lOffset > 0 ) { @@ -1559,7 +1559,7 @@ static PHB_SYMB hb_clsSenderSymbol( void ) static HB_USHORT hb_clsSenderObjectClasss( void ) { - LONG lOffset = hb_clsSenderOffset(); + HB_LONG lOffset = hb_clsSenderOffset(); if( lOffset > 0 ) { @@ -2421,7 +2421,7 @@ void hb_dbg_objSendMessage( int iProcLevel, PHB_ITEM pObject, PHB_ITEM pMessage, int iLevel = hb_stackCallDepth(); if( iProcLevel < iLevel ) { - LONG lOffset = hb_stackBaseProcOffset( iLevel - iProcLevel ); + HB_LONG lOffset = hb_stackBaseProcOffset( iLevel - iProcLevel ); if( lOffset > 0 ) { PHB_ITEM pItem = hb_stackItem( lOffset ); @@ -4053,7 +4053,7 @@ HB_FUNC( __CLSPARENT ) HB_FUNC( __SENDER ) { HB_STACK_TLS_PRELOAD - LONG lOffset = hb_stackBaseProcOffset( 2 ); + HB_LONG lOffset = hb_stackBaseProcOffset( 2 ); if( lOffset > 0 ) { @@ -4087,7 +4087,7 @@ HB_FUNC( __CLSSYNCWAIT ) HB_STACK_TLS_PRELOAD PHB_ITEM pMutex = NULL; ULONG ulMilliSec = HB_THREAD_INFINITE_WAIT; - LONG lOffset = hb_stackBaseProcOffset( 2 ); + HB_LONG lOffset = hb_stackBaseProcOffset( 2 ); if( lOffset > 0 ) { @@ -4918,14 +4918,14 @@ HB_FUNC( __CLSGETPROPERTIES ) HB_FUNC( __CLSPREALLOCATE ) { HB_STACK_TLS_PRELOAD - LONG lNewSize = hb_parnl( 1 ); + HB_LONG lNewSize = hb_parnl( 1 ); - if( lNewSize > ( LONG ) USHRT_MAX ) + if( lNewSize > ( HB_LONG ) USHRT_MAX ) lNewSize = USHRT_MAX; HB_CLASS_LOCK - if( lNewSize > ( LONG ) s_uiClsSize ) + if( lNewSize > ( HB_LONG ) s_uiClsSize ) { s_uiClsSize = ( HB_USHORT ) lNewSize; s_pClasses = ( PCLASS * ) hb_xrealloc( s_pClasses, sizeof( PCLASS ) * @@ -5112,7 +5112,7 @@ HB_BOOL hb_objGetpMethod( PHB_ITEM pObject, PHB_SYMB pMessage ) */ const char * hb_clsRealMethodName( void ) { - LONG lOffset = hb_stackBaseProcOffset( 1 ); + HB_LONG lOffset = hb_stackBaseProcOffset( 1 ); const char * szName = NULL; if( lOffset > 0 ) diff --git a/harbour/src/vm/codebloc.c b/harbour/src/vm/codebloc.c index 77085af857..32db416952 100644 --- a/harbour/src/vm/codebloc.c +++ b/harbour/src/vm/codebloc.c @@ -311,7 +311,7 @@ void hb_codeblockEvaluate( HB_ITEM_PTR pItem ) /* Get local variable referenced in a codeblock */ -PHB_ITEM hb_codeblockGetVar( PHB_ITEM pItem, LONG iItemPos ) +PHB_ITEM hb_codeblockGetVar( PHB_ITEM pItem, HB_LONG iItemPos ) { HB_CODEBLOCK_PTR pCBlock = pItem->item.asBlock.value; @@ -323,7 +323,7 @@ PHB_ITEM hb_codeblockGetVar( PHB_ITEM pItem, LONG iItemPos ) /* Get local variable passed by reference */ -PHB_ITEM hb_codeblockGetRef( HB_CODEBLOCK_PTR pCBlock, LONG iItemPos ) +PHB_ITEM hb_codeblockGetRef( HB_CODEBLOCK_PTR pCBlock, HB_LONG iItemPos ) { HB_TRACE(HB_TR_DEBUG, ("hb_codeblockGetRef(%p, %ld)", pCBlock, iItemPos)); diff --git a/harbour/src/vm/debug.c b/harbour/src/vm/debug.c index e27d16e362..a57a5f7054 100644 --- a/harbour/src/vm/debug.c +++ b/harbour/src/vm/debug.c @@ -162,9 +162,9 @@ HB_FUNC( __DBGVMSTKGLIST ) * $FuncName$ hb_stackLen( ) * $Description$ Returns params plus locals amount of the nProcLevel function * $End$ */ -static LONG hb_stackLen( int iLevel ) +static HB_LONG hb_stackLen( int iLevel ) { - LONG lBaseOffset, lPrevOffset, lLen; + HB_LONG lBaseOffset, lPrevOffset, lLen; HB_TRACE(HB_TR_DEBUG, ("hb_stackLen()")); @@ -207,7 +207,7 @@ HB_FUNC( __DBGVMSTKLLIST ) { PHB_ITEM pReturn; HB_SIZE ulLen, ul; - LONG lBaseOffset, lPrevOffset; + HB_LONG lBaseOffset, lPrevOffset; lBaseOffset = hb_stackBaseOffset(); lPrevOffset = hb_stackItem( lBaseOffset - 1 )->item.asSymbol.stackstate->lBaseItem; @@ -235,7 +235,7 @@ HB_FUNC( __DBGVMPARLLIST ) PHB_ITEM hb_dbg_vmVarLGet( int iLevel, int iLocal ) { PHB_ITEM pLocal = NULL; - LONG lBaseOffset; + HB_LONG lBaseOffset; lBaseOffset = hb_stackBaseOffset(); while( iLevel-- > 0 && lBaseOffset > 1 ) @@ -285,7 +285,7 @@ HB_FUNC( __DBGVMVARLSET ) { int iLevel = hb_parni( 1 ) + 1; int iLocal = hb_parni( 2 ); - LONG lBaseOffset; + HB_LONG lBaseOffset; PHB_ITEM pLocal; lBaseOffset = hb_stackBaseOffset(); diff --git a/harbour/src/vm/estack.c b/harbour/src/vm/estack.c index 14606fd1cb..0fce1c1ee7 100644 --- a/harbour/src/vm/estack.c +++ b/harbour/src/vm/estack.c @@ -159,7 +159,7 @@ static HB_SYMB s_initSymbol = { "hb_stackInit", { HB_FS_STATIC }, { NULL }, NULL static void hb_stack_init( PHB_STACK pStack ) { - LONG i; + HB_LONG i; HB_TRACE(HB_TR_DEBUG, ("hb_stack_init(%p)", pStack)); @@ -211,7 +211,7 @@ static void hb_stack_destroy_TSD( PHB_STACK pStack ) static void hb_stack_free( PHB_STACK pStack ) { - LONG i; + HB_LONG i; HB_TRACE(HB_TR_DEBUG, ("hb_stack_free(%p)", pStack)); @@ -630,9 +630,9 @@ void hb_stackPushReturn( void ) void hb_stackIncrease( void ) { HB_STACK_TLS_PRELOAD - LONG BaseIndex; /* index of stack base */ - LONG CurrIndex; /* index of current top item */ - LONG EndIndex; /* index of current top item */ + HB_LONG BaseIndex; /* index of stack base */ + HB_LONG CurrIndex; /* index of current top item */ + HB_LONG EndIndex; /* index of current top item */ HB_TRACE(HB_TR_DEBUG, ("hb_stackIncrease()")); @@ -658,7 +658,7 @@ void hb_stackIncrease( void ) while( ++EndIndex < hb_stack.wItems ); } -void hb_stackRemove( LONG lUntilPos ) +void hb_stackRemove( HB_LONG lUntilPos ) { HB_STACK_TLS_PRELOAD HB_ITEM_PTR * pEnd = hb_stack.pItems + lUntilPos; @@ -803,7 +803,7 @@ HB_ITEM_PTR hb_stackReturnItem( void ) } #undef hb_stackTopOffset -LONG hb_stackTopOffset( void ) +HB_LONG hb_stackTopOffset( void ) { HB_STACK_TLS_PRELOAD @@ -811,7 +811,7 @@ LONG hb_stackTopOffset( void ) } #undef hb_stackBaseOffset -LONG hb_stackBaseOffset( void ) +HB_LONG hb_stackBaseOffset( void ) { HB_STACK_TLS_PRELOAD @@ -819,7 +819,7 @@ LONG hb_stackBaseOffset( void ) } #undef hb_stackTotalItems -LONG hb_stackTotalItems( void ) +HB_LONG hb_stackTotalItems( void ) { #if defined( HB_MT_VM ) if( hb_stack_ready() ) @@ -928,14 +928,14 @@ void hb_stackSetStaticsBase( void * pBase ) } #undef hb_stackGetRecoverBase -LONG hb_stackGetRecoverBase( void ) +HB_LONG hb_stackGetRecoverBase( void ) { HB_STACK_TLS_PRELOAD return hb_stack.lRecoverBase; } #undef hb_stackSetRecoverBase -void hb_stackSetRecoverBase( LONG lBase ) +void hb_stackSetRecoverBase( HB_LONG lBase ) { HB_STACK_TLS_PRELOAD hb_stack.lRecoverBase = lBase; @@ -964,14 +964,14 @@ PHB_ITEM hb_stackWithObjectItem( void ) } #undef hb_stackWithObjectOffset -LONG hb_stackWithObjectOffset( void ) +HB_LONG hb_stackWithObjectOffset( void ) { HB_STACK_TLS_PRELOAD return hb_stack.lWithObject; } #undef hb_stackWithObjectSetOffset -void hb_stackWithObjectSetOffset( LONG lOffset ) +void hb_stackWithObjectSetOffset( HB_LONG lOffset ) { HB_STACK_TLS_PRELOAD hb_stack.lWithObject = lOffset; @@ -1045,7 +1045,7 @@ void hb_stackClearMemvarsBase( void ) int hb_stackCallDepth( void ) { HB_STACK_TLS_PRELOAD - LONG lOffset = hb_stack.pBase - hb_stack.pItems; + HB_LONG lOffset = hb_stack.pBase - hb_stack.pItems; int iLevel = 0; while( lOffset > 0 ) @@ -1057,10 +1057,10 @@ int hb_stackCallDepth( void ) return iLevel; } -LONG hb_stackBaseProcOffset( int iLevel ) +HB_LONG hb_stackBaseProcOffset( int iLevel ) { HB_STACK_TLS_PRELOAD - LONG lOffset = hb_stack.pBase - hb_stack.pItems; + HB_LONG lOffset = hb_stack.pBase - hb_stack.pItems; while( iLevel-- > 0 && lOffset > 0 ) lOffset = ( * ( hb_stack.pItems + lOffset ) )->item.asSymbol.stackstate->lBaseItem; diff --git a/harbour/src/vm/eval.c b/harbour/src/vm/eval.c index 7c3fba3f03..de5d352816 100644 --- a/harbour/src/vm/eval.c +++ b/harbour/src/vm/eval.c @@ -350,10 +350,10 @@ void hb_evalBlock( PHB_ITEM pCodeBlock, ... ) HB_FUNC( HB_FORNEXT ) /* nStart, nEnd | bEnd, bCode, nStep */ { - LONG lStart = hb_parnl( 1 ), lEnd; + HB_LONG lStart = hb_parnl( 1 ), lEnd; PHB_ITEM pEndBlock = hb_param( 2, HB_IT_BLOCK ); PHB_ITEM pCodeBlock = hb_param( 3, HB_IT_BLOCK ); - LONG lStep = ( hb_pcount() > 3 ) ? hb_parnl( 4 ) : 1; + HB_LONG lStep = ( hb_pcount() > 3 ) ? hb_parnl( 4 ) : 1; if( pCodeBlock ) { diff --git a/harbour/src/vm/hvm.c b/harbour/src/vm/hvm.c index 9e942ac6e1..58a2b1ebb2 100644 --- a/harbour/src/vm/hvm.c +++ b/harbour/src/vm/hvm.c @@ -107,7 +107,7 @@ static void hb_vmNegate( void ); /* negates (-) the latest value on static void hb_vmInc( HB_ITEM_PTR pItem ); /* increment the latest numeric value on the stack */ static void hb_vmDec( HB_ITEM_PTR pItem ); /* decrements the latest numeric value on the stack */ static void hb_vmFuncPtr( void ); /* pushes a function address pointer. Removes the symbol from the satck */ -static void hb_vmAddInt( HB_ITEM_PTR pResult, LONG lAdd ); /* add integer to given item */ +static void hb_vmAddInt( HB_ITEM_PTR pResult, HB_LONG lAdd ); /* add integer to given item */ static void hb_vmPlus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 ); /* sums given values */ static void hb_vmMinus( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 ); /* substracts given values */ static void hb_vmMult( HB_ITEM_PTR pResult, HB_ITEM_PTR pItem1, HB_ITEM_PTR pItem2 ); /* multiplies given values */ @@ -2923,7 +2923,7 @@ void hb_vmExecute( const HB_BYTE * pCode, PHB_SYMB pSymbols ) /* character / misc ) */ /* ------------------------------- */ -static void hb_vmAddInt( HB_ITEM_PTR pResult, LONG lAdd ) +static void hb_vmAddInt( HB_ITEM_PTR pResult, HB_LONG lAdd ) { HB_TRACE(HB_TR_DEBUG, ("hb_vmAddInt(%p,%ld)", pResult, lAdd)); @@ -4408,7 +4408,7 @@ static void hb_vmSeqBlock( void ) static HB_GARBAGE_FUNC( hb_withObjectDestructor ) { HB_STACK_TLS_PRELOAD - LONG * plWithObjectBase = ( LONG * ) Cargo; + HB_LONG * plWithObjectBase = ( HB_LONG * ) Cargo; hb_stackWithObjectSetOffset( * plWithObjectBase ); } @@ -4422,13 +4422,13 @@ static const HB_GC_FUNCS s_gcWithObjectFuncs = static void hb_vmWithObjectStart( void ) { HB_STACK_TLS_PRELOAD - LONG * plWithObjectBase; + HB_LONG * plWithObjectBase; PHB_ITEM pItem; HB_TRACE(HB_TR_DEBUG, ("hb_vmWithObjectStart()")); pItem = hb_stackAllocItem(); - plWithObjectBase = ( LONG * ) hb_gcAllocRaw( sizeof( LONG ), + plWithObjectBase = ( HB_LONG * ) hb_gcAllocRaw( sizeof( HB_LONG ), &s_gcWithObjectFuncs ); * plWithObjectBase = hb_stackWithObjectOffset(); pItem->type = HB_IT_POINTER; @@ -5464,10 +5464,10 @@ static void hb_vmMacroPushIndex( void ) * (-1) 2 // number of arguments * we should join them into one continuous list */ -static LONG hb_vmArgsJoin( LONG lLevel, HB_USHORT uiArgSets ) +static HB_LONG hb_vmArgsJoin( HB_LONG lLevel, HB_USHORT uiArgSets ) { HB_STACK_TLS_PRELOAD - LONG lArgs, lRestArgs, lOffset; + HB_LONG lArgs, lRestArgs, lOffset; PHB_ITEM pArgs = hb_stackItemFromTop( lLevel ) ; @@ -5494,7 +5494,7 @@ static LONG hb_vmArgsJoin( LONG lLevel, HB_USHORT uiArgSets ) static void hb_vmMacroDo( HB_USHORT uiArgSets ) { HB_STACK_TLS_PRELOAD - LONG lArgs; + HB_LONG lArgs; HB_TRACE(HB_TR_DEBUG, ("hb_vmMacroDo(%hu)", uiArgSets)); @@ -5506,7 +5506,7 @@ static void hb_vmMacroDo( HB_USHORT uiArgSets ) static void hb_vmMacroFunc( HB_USHORT uiArgSets ) { HB_STACK_TLS_PRELOAD - LONG lArgs; + HB_LONG lArgs; HB_TRACE(HB_TR_DEBUG, ("hb_vmMacroFunc(%hu)", uiArgSets)); @@ -5520,7 +5520,7 @@ static void hb_vmMacroFunc( HB_USHORT uiArgSets ) static void hb_vmMacroSend( HB_USHORT uiArgSets ) { HB_STACK_TLS_PRELOAD - LONG lArgs; + HB_LONG lArgs; HB_TRACE(HB_TR_DEBUG, ("hb_vmMacroSend(%hu)", uiArgSets)); @@ -5534,7 +5534,7 @@ static void hb_vmMacroSend( HB_USHORT uiArgSets ) static void hb_vmMacroArrayGen( HB_USHORT uiArgSets ) { HB_STACK_TLS_PRELOAD - LONG lArgs; + HB_LONG lArgs; HB_TRACE(HB_TR_DEBUG, ("hb_vmMacroArrayGen(%hu)", uiArgSets)); @@ -6920,7 +6920,7 @@ static void hb_vmPushLocal( int iLocal ) /* local variable referenced in a codeblock * hb_stackSelfItem() points to a codeblock that is currently evaluated */ - pLocal = hb_codeblockGetRef( hb_stackSelfItem()->item.asBlock.value, ( LONG ) iLocal ); + pLocal = hb_codeblockGetRef( hb_stackSelfItem()->item.asBlock.value, ( HB_LONG ) iLocal ); } hb_itemCopy( hb_stackAllocItem(), @@ -9025,7 +9025,7 @@ static PHB_ITEM hb_xvmLocalPtr( int iLocal ) /* local variable referenced in a codeblock * hb_stackSelfItem() points to a codeblock that is currently evaluated */ - return hb_codeblockGetRef( hb_stackSelfItem()->item.asBlock.value, ( LONG ) iLocal ); + return hb_codeblockGetRef( hb_stackSelfItem()->item.asBlock.value, ( HB_LONG ) iLocal ); } } @@ -9273,7 +9273,7 @@ HB_BOOL hb_xvmPopAliasedVar( PHB_SYMB pSymbol ) HB_XVM_RETURN } -void hb_xvmLocalSetInt( int iLocal, LONG lValue ) +void hb_xvmLocalSetInt( int iLocal, HB_LONG lValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pLocal; @@ -9308,7 +9308,7 @@ void hb_xvmLocalSetInt( int iLocal, LONG lValue ) } } -HB_BOOL hb_xvmLocalAddInt( int iLocal, LONG lAdd ) +HB_BOOL hb_xvmLocalAddInt( int iLocal, HB_LONG lAdd ) { HB_STACK_TLS_PRELOAD @@ -9536,7 +9536,7 @@ HB_BOOL hb_xvmExactlyEqual( void ) HB_XVM_RETURN } -HB_BOOL hb_xvmEqualInt( LONG lValue ) +HB_BOOL hb_xvmEqualInt( HB_LONG lValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem; @@ -9546,7 +9546,7 @@ HB_BOOL hb_xvmEqualInt( LONG lValue ) pItem = hb_stackItemFromTop( -1 ); if( HB_IS_INTEGER( pItem ) ) { - pItem->item.asLogical.value = ( LONG ) pItem->item.asInteger.value == lValue; + pItem->item.asLogical.value = ( HB_LONG ) pItem->item.asInteger.value == lValue; pItem->type = HB_IT_LOGICAL; } else if( HB_IS_LONG( pItem ) ) @@ -9589,7 +9589,7 @@ HB_BOOL hb_xvmEqualInt( LONG lValue ) HB_XVM_RETURN } -HB_BOOL hb_xvmEqualIntIs( LONG lValue, HB_BOOL * pfValue ) +HB_BOOL hb_xvmEqualIntIs( HB_LONG lValue, HB_BOOL * pfValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem; @@ -9599,7 +9599,7 @@ HB_BOOL hb_xvmEqualIntIs( LONG lValue, HB_BOOL * pfValue ) pItem = hb_stackItemFromTop( -1 ); if( HB_IS_INTEGER( pItem ) ) { - * pfValue = ( LONG ) pItem->item.asInteger.value == lValue; + * pfValue = ( HB_LONG ) pItem->item.asInteger.value == lValue; hb_stackDec(); } else if( HB_IS_LONG( pItem ) ) @@ -9655,7 +9655,7 @@ HB_BOOL hb_xvmNotEqual( void ) HB_XVM_RETURN } -HB_BOOL hb_xvmNotEqualInt( LONG lValue ) +HB_BOOL hb_xvmNotEqualInt( HB_LONG lValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem; @@ -9665,7 +9665,7 @@ HB_BOOL hb_xvmNotEqualInt( LONG lValue ) pItem = hb_stackItemFromTop( -1 ); if( HB_IS_INTEGER( pItem ) ) { - pItem->item.asLogical.value = ( LONG ) pItem->item.asInteger.value != lValue; + pItem->item.asLogical.value = ( HB_LONG ) pItem->item.asInteger.value != lValue; pItem->type = HB_IT_LOGICAL; } else if( HB_IS_LONG( pItem ) ) @@ -9708,7 +9708,7 @@ HB_BOOL hb_xvmNotEqualInt( LONG lValue ) HB_XVM_RETURN } -HB_BOOL hb_xvmNotEqualIntIs( LONG lValue, HB_BOOL * pfValue ) +HB_BOOL hb_xvmNotEqualIntIs( HB_LONG lValue, HB_BOOL * pfValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem; @@ -9718,7 +9718,7 @@ HB_BOOL hb_xvmNotEqualIntIs( LONG lValue, HB_BOOL * pfValue ) pItem = hb_stackItemFromTop( -1 ); if( HB_IS_INTEGER( pItem ) ) { - * pfValue = ( LONG ) pItem->item.asInteger.value != lValue; + * pfValue = ( HB_LONG ) pItem->item.asInteger.value != lValue; hb_stackDec(); } else if( HB_IS_LONG( pItem ) ) @@ -9774,7 +9774,7 @@ HB_BOOL hb_xvmLess( void ) HB_XVM_RETURN } -HB_BOOL hb_xvmLessThenInt( LONG lValue ) +HB_BOOL hb_xvmLessThenInt( HB_LONG lValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem; @@ -9784,7 +9784,7 @@ HB_BOOL hb_xvmLessThenInt( LONG lValue ) pItem = hb_stackItemFromTop( -1 ); if( HB_IS_INTEGER( pItem ) ) { - pItem->item.asLogical.value = ( LONG ) pItem->item.asInteger.value < lValue; + pItem->item.asLogical.value = ( HB_LONG ) pItem->item.asInteger.value < lValue; pItem->type = HB_IT_LOGICAL; } else if( HB_IS_LONG( pItem ) ) @@ -9822,7 +9822,7 @@ HB_BOOL hb_xvmLessThenInt( LONG lValue ) HB_XVM_RETURN } -HB_BOOL hb_xvmLessThenIntIs( LONG lValue, HB_BOOL * pfValue ) +HB_BOOL hb_xvmLessThenIntIs( HB_LONG lValue, HB_BOOL * pfValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem; @@ -9832,7 +9832,7 @@ HB_BOOL hb_xvmLessThenIntIs( LONG lValue, HB_BOOL * pfValue ) pItem = hb_stackItemFromTop( -1 ); if( HB_IS_INTEGER( pItem ) ) { - * pfValue = ( LONG ) pItem->item.asInteger.value < lValue; + * pfValue = ( HB_LONG ) pItem->item.asInteger.value < lValue; hb_stackDec(); } else if( HB_IS_LONG( pItem ) ) @@ -9883,7 +9883,7 @@ HB_BOOL hb_xvmLessEqual( void ) HB_XVM_RETURN } -HB_BOOL hb_xvmLessEqualThenInt( LONG lValue ) +HB_BOOL hb_xvmLessEqualThenInt( HB_LONG lValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem; @@ -9893,7 +9893,7 @@ HB_BOOL hb_xvmLessEqualThenInt( LONG lValue ) pItem = hb_stackItemFromTop( -1 ); if( HB_IS_INTEGER( pItem ) ) { - pItem->item.asLogical.value = ( LONG ) pItem->item.asInteger.value <= lValue; + pItem->item.asLogical.value = ( HB_LONG ) pItem->item.asInteger.value <= lValue; pItem->type = HB_IT_LOGICAL; } else if( HB_IS_LONG( pItem ) ) @@ -9931,7 +9931,7 @@ HB_BOOL hb_xvmLessEqualThenInt( LONG lValue ) HB_XVM_RETURN } -HB_BOOL hb_xvmLessEqualThenIntIs( LONG lValue, HB_BOOL * pfValue ) +HB_BOOL hb_xvmLessEqualThenIntIs( HB_LONG lValue, HB_BOOL * pfValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem; @@ -9941,7 +9941,7 @@ HB_BOOL hb_xvmLessEqualThenIntIs( LONG lValue, HB_BOOL * pfValue ) pItem = hb_stackItemFromTop( -1 ); if( HB_IS_INTEGER( pItem ) ) { - * pfValue = ( LONG ) pItem->item.asInteger.value <= lValue; + * pfValue = ( HB_LONG ) pItem->item.asInteger.value <= lValue; hb_stackDec(); } else if( HB_IS_LONG( pItem ) ) @@ -9992,7 +9992,7 @@ HB_BOOL hb_xvmGreater( void ) HB_XVM_RETURN } -HB_BOOL hb_xvmGreaterThenInt( LONG lValue ) +HB_BOOL hb_xvmGreaterThenInt( HB_LONG lValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem; @@ -10002,7 +10002,7 @@ HB_BOOL hb_xvmGreaterThenInt( LONG lValue ) pItem = hb_stackItemFromTop( -1 ); if( HB_IS_INTEGER( pItem ) ) { - pItem->item.asLogical.value = ( LONG ) pItem->item.asInteger.value > lValue; + pItem->item.asLogical.value = ( HB_LONG ) pItem->item.asInteger.value > lValue; pItem->type = HB_IT_LOGICAL; } else if( HB_IS_LONG( pItem ) ) @@ -10040,7 +10040,7 @@ HB_BOOL hb_xvmGreaterThenInt( LONG lValue ) HB_XVM_RETURN } -HB_BOOL hb_xvmGreaterThenIntIs( LONG lValue, HB_BOOL * pfValue ) +HB_BOOL hb_xvmGreaterThenIntIs( HB_LONG lValue, HB_BOOL * pfValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem; @@ -10050,7 +10050,7 @@ HB_BOOL hb_xvmGreaterThenIntIs( LONG lValue, HB_BOOL * pfValue ) pItem = hb_stackItemFromTop( -1 ); if( HB_IS_INTEGER( pItem ) ) { - * pfValue = ( LONG ) pItem->item.asInteger.value > lValue; + * pfValue = ( HB_LONG ) pItem->item.asInteger.value > lValue; hb_stackDec(); } else if( HB_IS_LONG( pItem ) ) @@ -10101,7 +10101,7 @@ HB_BOOL hb_xvmGreaterEqual( void ) HB_XVM_RETURN } -HB_BOOL hb_xvmGreaterEqualThenInt( LONG lValue ) +HB_BOOL hb_xvmGreaterEqualThenInt( HB_LONG lValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem; @@ -10111,7 +10111,7 @@ HB_BOOL hb_xvmGreaterEqualThenInt( LONG lValue ) pItem = hb_stackItemFromTop( -1 ); if( HB_IS_INTEGER( pItem ) ) { - pItem->item.asLogical.value = ( LONG ) pItem->item.asInteger.value >= lValue; + pItem->item.asLogical.value = ( HB_LONG ) pItem->item.asInteger.value >= lValue; pItem->type = HB_IT_LOGICAL; } else if( HB_IS_LONG( pItem ) ) @@ -10149,7 +10149,7 @@ HB_BOOL hb_xvmGreaterEqualThenInt( LONG lValue ) HB_XVM_RETURN } -HB_BOOL hb_xvmGreaterEqualThenIntIs( LONG lValue, HB_BOOL * pfValue ) +HB_BOOL hb_xvmGreaterEqualThenIntIs( HB_LONG lValue, HB_BOOL * pfValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pItem; @@ -10159,7 +10159,7 @@ HB_BOOL hb_xvmGreaterEqualThenIntIs( LONG lValue, HB_BOOL * pfValue ) pItem = hb_stackItemFromTop( -1 ); if( HB_IS_INTEGER( pItem ) ) { - * pfValue = ( LONG ) pItem->item.asInteger.value >= lValue; + * pfValue = ( HB_LONG ) pItem->item.asInteger.value >= lValue; hb_stackDec(); } else if( HB_IS_LONG( pItem ) ) @@ -10210,7 +10210,7 @@ HB_BOOL hb_xvmInstring( void ) HB_XVM_RETURN } -HB_BOOL hb_xvmAddInt( LONG lAdd ) +HB_BOOL hb_xvmAddInt( HB_LONG lAdd ) { HB_STACK_TLS_PRELOAD @@ -10311,7 +10311,7 @@ HB_BOOL hb_xvmMinusEqPop( void ) HB_XVM_RETURN } -HB_BOOL hb_xvmMultByInt( LONG lValue ) +HB_BOOL hb_xvmMultByInt( HB_LONG lValue ) { HB_STACK_TLS_PRELOAD PHB_ITEM pValue; @@ -10397,7 +10397,7 @@ HB_BOOL hb_xvmMultEqPop( void ) HB_XVM_RETURN } -HB_BOOL hb_xvmDivideByInt( LONG lDivisor ) +HB_BOOL hb_xvmDivideByInt( HB_LONG lDivisor ) { HB_STACK_TLS_PRELOAD PHB_ITEM pValue; diff --git a/harbour/src/vm/macro.c b/harbour/src/vm/macro.c index 742a4f2a99..2799e80175 100644 --- a/harbour/src/vm/macro.c +++ b/harbour/src/vm/macro.c @@ -1111,7 +1111,7 @@ HB_BOOL hb_macroIsValidMacroText( const char * szText, HB_SIZE ulLen ) return HB_FALSE; } -ULONG hb_macroGenJump( LONG lOffset, HB_COMP_DECL ) +ULONG hb_macroGenJump( HB_LONG lOffset, HB_COMP_DECL ) { if( lOffset == 0 ) hb_macroGenPCode4( HB_P_JUMPFAR, 0, 0, 0, HB_COMP_PARAM ); @@ -1127,7 +1127,7 @@ ULONG hb_macroGenJump( LONG lOffset, HB_COMP_DECL ) return HB_PCODE_DATA->lPCodePos - 3; } -ULONG hb_macroGenJumpFalse( LONG lOffset, HB_COMP_DECL ) +ULONG hb_macroGenJumpFalse( HB_LONG lOffset, HB_COMP_DECL ) { if( lOffset == 0 ) hb_macroGenPCode4( HB_P_JUMPFALSEFAR, 0, 0, 0, HB_COMP_PARAM ); @@ -1143,7 +1143,7 @@ ULONG hb_macroGenJumpFalse( LONG lOffset, HB_COMP_DECL ) return HB_PCODE_DATA->lPCodePos - 3; } -ULONG hb_macroGenJumpTrue( LONG lOffset, HB_COMP_DECL ) +ULONG hb_macroGenJumpTrue( HB_LONG lOffset, HB_COMP_DECL ) { if( lOffset == 0 ) hb_macroGenPCode4( HB_P_JUMPTRUEFAR, 0, 0, 0, HB_COMP_PARAM ); @@ -1162,7 +1162,7 @@ ULONG hb_macroGenJumpTrue( LONG lOffset, HB_COMP_DECL ) void hb_macroGenJumpThere( ULONG ulFrom, ULONG ulTo, HB_COMP_DECL ) { HB_BYTE * pCode = HB_PCODE_DATA->pCode; - LONG lOffset = ulTo - ulFrom + 1; + HB_LONG lOffset = ulTo - ulFrom + 1; if( HB_LIM_INT24( lOffset ) ) HB_PUT_LE_UINT24( &pCode[ ulFrom ], lOffset ); diff --git a/harbour/src/vm/maindll.c b/harbour/src/vm/maindll.c index 9f33ade104..c2b204a150 100644 --- a/harbour/src/vm/maindll.c +++ b/harbour/src/vm/maindll.c @@ -87,21 +87,21 @@ BOOL WINAPI DllEntryPoint( HINSTANCE hInstance, DWORD fdwReason, PVOID pvReserve return TRUE; } -LONG PASCAL HBDLLENTRY( char * cProcName ) +LONG PASCAL HBDLLENTRY( const char * cProcName ) { hb_itemDoC( cProcName, 0, 0 ); return 0; } -LONG PASCAL HBDLLENTRY1( char * cProcName, LONG pItem ) +LONG PASCAL HBDLLENTRY1( const char * cProcName, void * pItem ) { hb_itemDoC( cProcName, 1, ( PHB_ITEM ) pItem, 0 ); return 0; } -LONG PASCAL HBDLLENTRY2( char * cProcName, LONG pItem1, LONG pItem2 ) +LONG PASCAL HBDLLENTRY2( const char * cProcName, void * pItem1, void * pItem2 ) { hb_itemDoC( cProcName, 2, ( PHB_ITEM ) pItem1, ( PHB_ITEM ) pItem2, 0 ); diff --git a/harbour/src/vm/memvars.c b/harbour/src/vm/memvars.c index 25f962e5a3..ca0624716f 100644 --- a/harbour/src/vm/memvars.c +++ b/harbour/src/vm/memvars.c @@ -871,7 +871,7 @@ static ULONG hb_memvarGetBaseOffset( int iProcLevel ) int iLevel = hb_stackCallDepth(); if( iProcLevel < iLevel ) { - LONG lOffset = hb_stackBaseProcOffset( iLevel - iProcLevel - 1 ); + HB_LONG lOffset = hb_stackBaseProcOffset( iLevel - iProcLevel - 1 ); if( lOffset > 0 ) return hb_stackItem( lOffset )->item.asSymbol.stackstate->ulPrivateBase; } diff --git a/harbour/src/vm/pvalue.c b/harbour/src/vm/pvalue.c index 1093fda839..254b06e590 100644 --- a/harbour/src/vm/pvalue.c +++ b/harbour/src/vm/pvalue.c @@ -57,7 +57,7 @@ HB_FUNC( HB_PVALUE ) { - LONG lOffset = hb_stackBaseItem()->item.asSymbol.stackstate->lBaseItem; + HB_LONG lOffset = hb_stackBaseItem()->item.asSymbol.stackstate->lBaseItem; HB_USHORT uiParam = ( HB_USHORT ) hb_parni( 1 ); if( uiParam && uiParam <= hb_stackItem( lOffset )->item.asSymbol.paramcnt ) diff --git a/harbour/src/vm/runner.c b/harbour/src/vm/runner.c index 16b6f4a748..84e994349b 100644 --- a/harbour/src/vm/runner.c +++ b/harbour/src/vm/runner.c @@ -84,7 +84,7 @@ typedef struct ULONG ulFuncs; /* Number of functions */ HB_BOOL fInit; /* should be INIT functions executed */ HB_BOOL fExit; /* should be EXIT functions executed */ - LONG lSymStart; /* Startup Symbol */ + HB_LONG lSymStart; /* Startup Symbol */ PHB_SYMB pSymRead; /* Symbols read */ PHB_DYNF pDynFunc; /* Functions read */ PHB_SYMBOLS pModuleSymbols; diff --git a/harbour/tests/bldtest/bldtest.c b/harbour/tests/bldtest/bldtest.c index 954d7e924c..2e543d0cd6 100644 --- a/harbour/tests/bldtest/bldtest.c +++ b/harbour/tests/bldtest/bldtest.c @@ -24,13 +24,13 @@ int main() printf("\t sizeof(HB_BYTE)=%d %s\n", (int) sizeof(HB_BYTE ), sizeof(HB_BYTE )==1 ? "OK" : "BAD" ); printf("\t sizeof(HB_SHORT)=%d %s\n", (int) sizeof(HB_SHORT ), sizeof(HB_SHORT )==2 ? "OK" : "BAD" ); printf("\t sizeof(HB_UINT)=%d %s\n", (int) sizeof(HB_UINT ), sizeof(HB_UINT )==4 || sizeof(HB_UINT)==8 ? "OK" : "BAD" ); - printf("\t sizeof(LONG)=%d %s\n", (int) sizeof(LONG ), sizeof(LONG )==4 || sizeof(LONG)==8 ? "OK" : "BAD" ); + printf("\t sizeof(HB_LONG)=%d %s\n", (int) sizeof(HB_LONG ), sizeof(HB_LONG )==4 || sizeof(HB_LONG)==8 ? "OK" : "BAD" ); printf("\tsizeof(HB_LONGLONG)=%d %s\n", (int) sizeof(HB_LONGLONG), sizeof(HB_LONGLONG)==8 ? "OK" : "BAD" ); printf("\t sizeof(double)=%d %s\n", (int) sizeof(double ), sizeof(double )==8 ? "OK" : "BAD" ); if ( sizeof(HB_BYTE)!=1 || sizeof(HB_SHORT)!=2 || - (sizeof(LONG)!=4 && sizeof(LONG)!=8) || + (sizeof(HB_LONG)!=4 && sizeof(HB_LONG)!=8) || (sizeof(HB_LONGLONG)!=4 && sizeof(HB_LONGLONG)!=8) || sizeof(double)!=8 ) {