diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ac296cf3d7..86c8084bcf 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,61 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-09-02 17:27 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/hbgtmk.sh + * harbour/tests/codebl.prg + * harbour/tests/testprof.prg + * harbour/tests/keywords.prg + * harbour/tests/testpp.prg + * harbour/make_rpm.sh + * harbour/makefile.gc + * harbour/bin/hb-mkslib.sh + * harbour/include/hbexpra.c + * harbour/include/hbmath.ch + * harbour/include/hbrddntx.h + * harbour/include/hbexprb.c + * harbour/harbour.spec + * harbour/contrib/dot/pp.prg + * harbour/contrib/libct/ctwin.c + * harbour/contrib/ole2/w32ole.c + * harbour/contrib/hgf/win32/win32.c + * harbour/contrib/mysql/mysql.ch + * harbour/contrib/odbc/todbc.prg + * harbour/contrib/odbc/sql.ch + * harbour/contrib/hb_struc/hbstruc.ch + * harbour/contrib/bmdbfcdx/bmdbfcdx1.c + * harbour/contrib/msql/msql.ch + * harbour/contrib/msql/readme.txt + * harbour/source/pp/ppcore.c + * harbour/source/rtl/gtdos/gtdos.c + * harbour/source/rtl/gtxwc/gtxwc.h + * harbour/source/rtl/hbgtcore.c + * harbour/source/rtl/gtcrs/gtcrs.h + * harbour/source/rtl/gtalleg/gtalleg.c + * harbour/source/rtl/gtalleg/ssf.h + * harbour/source/rtl/gtalleg/fixedth.sfc + * harbour/source/rtl/gtchrmap.c + * harbour/source/rtl/itemseri.c + * harbour/source/rtl/gtstd/gtstd.c + * harbour/source/rtl/gtsln/gtsln.h + * harbour/source/rtl/gttrm/gttrm.c + * harbour/source/rtl/gtpca/gtpca.c + * harbour/source/rtl/hbhex.c + * harbour/source/rtl/tget.prg + * harbour/source/rtl/gtcgi/gtcgi.c + * harbour/source/rtl/hbinet.c + * harbour/source/vm/hvm.c + * harbour/source/debug/dbgtobj.prg + * harbour/source/debug/dbgwa.prg + * harbour/source/common/expropt2.c + * harbour/source/rdd/dbfcdx/dbfcdx1.c + * harbour/source/rdd/dbffpt/dbffpt1.c + * harbour/utils/hbpp/hbppcore.c + * harbour/utils/hbpptest/pp_test.prg + * harbour/utils/hbpptest/pretest.prg + * harbour/make_tgz.sh + * converted TABs to SPACEs + 2007-09-01 16:23 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbcompat.ch + added some new translation rules diff --git a/harbour/bin/hb-mkslib.sh b/harbour/bin/hb-mkslib.sh index 651cf504b1..0518c84ae9 100755 --- a/harbour/bin/hb-mkslib.sh +++ b/harbour/bin/hb-mkslib.sh @@ -77,30 +77,30 @@ cd "${OTMPDIR}" for f in $* do case "${f}" in - *.o) - if [ ! -r "${dir}/${f}" ] - then - echo "cannot read file: ${f}" - exit 1 - fi - cp "${dir}/${f}" "${OTMPDIR}" || exit 1 - ;; - *.a) + *.o) if [ ! -r "${dir}/${f}" ] - then - echo "cannot read file: ${f}" - exit 1 - fi - d="${f%.a}" - d="${f##*/}" - mkdir $d - cd $d - ${CCPREFIX}ar -x "${dir}/${f}" || exit 1 - cd .. - ;; - *) + then + echo "cannot read file: ${f}" + exit 1 + fi + cp "${dir}/${f}" "${OTMPDIR}" || exit 1 + ;; + *.a) + if [ ! -r "${dir}/${f}" ] + then + echo "cannot read file: ${f}" + exit 1 + fi + d="${f%.a}" + d="${f##*/}" + mkdir $d + cd $d + ${CCPREFIX}ar -x "${dir}/${f}" || exit 1 + cd .. + ;; + *) linker_options="${linker_options} ${f}" - ;; + ;; esac done OBJLST=`find . -name \*.o` diff --git a/harbour/contrib/bmdbfcdx/bmdbfcdx1.c b/harbour/contrib/bmdbfcdx/bmdbfcdx1.c index 77ac70f31c..1e17f9a3a5 100644 --- a/harbour/contrib/bmdbfcdx/bmdbfcdx1.c +++ b/harbour/contrib/bmdbfcdx/bmdbfcdx1.c @@ -1763,7 +1763,7 @@ static void hb_cdxPageCheckDupTrl( LPCDXPAGE pPage, BYTE * pKeyBuf, SHORT iKeys, printf( "\r\npbValPrev=[%s] pbVal=[%s], [%d], pKeyBuf=%p", &pKeyBuf[ iPos - iLen ], &pKeyBuf[ iPos ], memcmp( &pKeyBuf[ iPos - iLen ], &pKeyBuf[ iPos ], iNum ), - pKeyBuf ); + pKeyBuf ); fflush(stdout); bErr = TRUE; } @@ -2057,7 +2057,7 @@ static int hb_cdxPageLeafDelKey( LPCDXPAGE pPage ) printf("\r\ndelkey: Page=%lx, iKey=%d/%d, rec=%ld, iFree=%d", pPage->Page, iKey, pPage->iKeys, (ULONG) HB_GET_LE_UINT32( &pPage->pKeyBuf[ ( iKey + 1 ) * iLen - 6 ] ), - pPage->iFree ); + pPage->iFree ); fflush(stdout); #endif iSpc = pPage->ReqByte + pPage->TagParent->uiLen - diff --git a/harbour/contrib/dot/pp.prg b/harbour/contrib/dot/pp.prg index beb1827bc7..00e535485a 100644 --- a/harbour/contrib/dot/pp.prg +++ b/harbour/contrib/dot/pp.prg @@ -428,7 +428,7 @@ STATIC s_aSwitchDefs := {} sSwitch += [ -FIX = Do not clone Clipper PreProcessor bugs.] + CRLF sSwitch += [ -U = Use command definitions set in (or none).] + CRLF - ? sSwitch + ? sSwitch ? QUIT endif @@ -2346,7 +2346,7 @@ FUNCTION RP_Run_Err( oErr, aProcedures, nLine ) Alert( [Must Default: ] + "'" + oErr:Operation + "' '" + oErr:Description + ; sArgs + ";" + ; PP_ProcName() + '(' + LTrim( Str( PP_ProcLine() ) ) + ");" + ; - ProcName(2) + "(" + LTrim( Str( ProcLine(2) ) ) + ")" ) + ProcName(2) + "(" + LTrim( Str( ProcLine(2) ) ) + ")" ) RETURN ( .F. ) ELSE @@ -2367,7 +2367,7 @@ FUNCTION RP_Run_Err( oErr, aProcedures, nLine ) oErr:Description + ; sArgs + ; PP_ProcName() + '(' + LTrim( Str( PP_ProcLine() ) ) + ");" + ; - ProcName(2) + "(" + LTrim( Str( ProcLine(2) ) ) + ")" ) + ProcName(2) + "(" + LTrim( Str( ProcLine(2) ) ) + ")" ) //BREAK oErr __Quit() @@ -9067,6 +9067,7 @@ FUNCTION PP_PreProText( sLines, asLines, bBlanks ) sTemp := asLines[nLine] ELSE aDel( asLines, nLine ) + nLines-- aSize( asLines, nLines ) IF nLine > nLines @@ -9075,9 +9076,9 @@ FUNCTION PP_PreProText( sLines, asLines, bBlanks ) ENDIF ENDDO - IF nLine > nLines - EXIT - ENDIF + IF nLine > nLines + EXIT + ENDIF //TraceLog( nLine, nLines, sTemp ) diff --git a/harbour/contrib/hb_struc/hbstruc.ch b/harbour/contrib/hb_struc/hbstruc.ch index 3145d083d2..8854e31848 100644 --- a/harbour/contrib/hb_struc/hbstruc.ch +++ b/harbour/contrib/hb_struc/hbstruc.ch @@ -3,8 +3,8 @@ #define HB_STRUCTURE #COMMAND STRUCTURE [, ] => ; - STATIC __ := {|| IF( __ == NIL, , ) , HB_Structure( <"StruName">, { <"Var1"> [, <"VarN">] } )} ;; - DECLARE [ ] ;; - #TRANSLATE AS NEW => AS STRUCTURE := ( Eval( __ ), HB_Structure( <"StruName"> ) ) + STATIC __ := {|| IF( __ == NIL, , ) , HB_Structure( <"StruName">, { <"Var1"> [, <"VarN">] } )} ;; + DECLARE [ ] ;; + #TRANSLATE AS NEW => AS STRUCTURE := ( Eval( __ ), HB_Structure( <"StruName"> ) ) #endif diff --git a/harbour/contrib/hgf/win32/win32.c b/harbour/contrib/hgf/win32/win32.c index 6e41d2fccf..95aa16532a 100644 --- a/harbour/contrib/hgf/win32/win32.c +++ b/harbour/contrib/hgf/win32/win32.c @@ -197,10 +197,10 @@ HB_FUNC( SETMENU ) HB_FUNC( SENDMESSAGE ) { hb_retnl( (LONG) SendMessage( - (HWND) hb_parnl( 1 ), // handle of destination window - (UINT) hb_parni( 2 ), // message to send - (WPARAM) hb_parnl( 3 ), // first message parameter - (LPARAM) hb_parnl( 4 ) // second message parameter + (HWND) hb_parnl( 1 ), // handle of destination window + (UINT) hb_parni( 2 ), // message to send + (WPARAM) hb_parnl( 3 ), // first message parameter + (LPARAM) hb_parnl( 4 ) // second message parameter ) ); } diff --git a/harbour/contrib/libct/ctwin.c b/harbour/contrib/libct/ctwin.c index d4e6928f5f..65ef1718eb 100644 --- a/harbour/contrib/libct/ctwin.c +++ b/harbour/contrib/libct/ctwin.c @@ -53,7 +53,7 @@ /* NOTE: User programs should never call this layer directly! */ /* This definition has to be placed before #include "hbapigt.h" */ -#define HB_GT_NAME CTW +#define HB_GT_NAME CTW #include "hbgtcore.h" #include "hbinit.h" diff --git a/harbour/contrib/msql/msql.ch b/harbour/contrib/msql/msql.ch index fd6c503304..a3082481b0 100644 --- a/harbour/contrib/msql/msql.ch +++ b/harbour/contrib/msql/msql.ch @@ -67,7 +67,7 @@ #define MSQL_MONEY_TYPE 9 #define MSQL_TIME_TYPE 10 #define MSQL_LAST_REAL_TYPE 10 -#define MSQL_IDX_TYPE 253 +#define MSQL_IDX_TYPE 253 #define MSQL_SYSVAR_TYPE 254 #define MSQL_ANY_TYPE 255 diff --git a/harbour/contrib/msql/readme.txt b/harbour/contrib/msql/readme.txt index c1fd2bd2e4..0097c56d74 100644 --- a/harbour/contrib/msql/readme.txt +++ b/harbour/contrib/msql/readme.txt @@ -47,5 +47,5 @@ from users (if any :-)) Excuse my poor english and happy selecting :-) -Maurilio Longo - maurilio.longo@libero.it +Maurilio Longo - maurilio.longo@libero.it diff --git a/harbour/contrib/mysql/mysql.ch b/harbour/contrib/mysql/mysql.ch index d05594ab0d..f3cb772e2f 100644 --- a/harbour/contrib/mysql/mysql.ch +++ b/harbour/contrib/mysql/mysql.ch @@ -100,18 +100,18 @@ #define NOT_NULL_FLAG 1 /* Field can't be NULL */ #define PRI_KEY_FLAG 2 /* Field is part of a primary key */ -#define UNIQUE_KEY_FLAG 4 /* Field is part of a unique key */ -#define MULTIPLE_KEY_FLAG 8 /* Field is part of a key */ -#define BLOB_FLAG 16 /* Field is a blob */ -#define UNSIGNED_FLAG 32 /* Field is unsigned */ -#define ZEROFILL_FLAG 64 /* Field is zerofill */ +#define UNIQUE_KEY_FLAG 4 /* Field is part of a unique key */ +#define MULTIPLE_KEY_FLAG 8 /* Field is part of a key */ +#define BLOB_FLAG 16 /* Field is a blob */ +#define UNSIGNED_FLAG 32 /* Field is unsigned */ +#define ZEROFILL_FLAG 64 /* Field is zerofill */ #define BINARY_FLAG 128 /* The following are only sent to new clients */ -#define ENUM_FLAG 256 /* field is an enum */ -#define AUTO_INCREMENT_FLAG 512 /* field is a autoincrement field */ -#define TIMESTAMP_FLAG 1024 /* Field is a timestamp */ -#define PART_KEY_FLAG 16384 /* Intern; Part of some key */ -#define GROUP_FLAG 32768 /* Intern group field */ +#define ENUM_FLAG 256 /* field is an enum */ +#define AUTO_INCREMENT_FLAG 512 /* field is a autoincrement field */ +#define TIMESTAMP_FLAG 1024 /* Field is a timestamp */ +#define PART_KEY_FLAG 16384 /* Intern; Part of some key */ +#define GROUP_FLAG 32768 /* Intern group field */ // Extension to DBS_xxx defines to encompass NOT NULL fields, needed by indexes diff --git a/harbour/contrib/odbc/sql.ch b/harbour/contrib/odbc/sql.ch index 9203a81721..f9cc2a78cb 100644 --- a/harbour/contrib/odbc/sql.ch +++ b/harbour/contrib/odbc/sql.ch @@ -32,7 +32,7 @@ #define SQL_BIGINT -5 #define SQL_TINYINT -6 -#define SQL_NVARCHAR -9 +#define SQL_NVARCHAR -9 #define SQL_TYPE_NULL 0 #define SQL_TYPE_MIN SQL_BIT @@ -113,9 +113,9 @@ nullablity of a column in a table. */ /* SQL Options */ -#define SQL_AUTOCOMMIT_OFF 0 -#define SQL_AUTOCOMMIT_ON 1 -#define SQL_AUTOCOMMIT 102 +#define SQL_AUTOCOMMIT_OFF 0 +#define SQL_AUTOCOMMIT_ON 1 +#define SQL_AUTOCOMMIT 102 #define SQL_INFO_FIRST 0 #define SQL_ACTIVE_CONNECTIONS 0 diff --git a/harbour/contrib/odbc/todbc.prg b/harbour/contrib/odbc/todbc.prg index 9e37bd79df..78f4baabc4 100644 --- a/harbour/contrib/odbc/todbc.prg +++ b/harbour/contrib/odbc/todbc.prg @@ -163,12 +163,12 @@ CLASS TODBC FROM HBClass METHOD SQLErrorMessage() - METHOD SetCnnOptions( nType, uBuffer ) - METHOD GetCnnOptions( nType ) - METHOD Commit() - METHOD RollBack() - METHOD SetStmtOptions( nType, uBuffer ) - METHOD GetStmtOptions( nType ) + METHOD SetCnnOptions( nType, uBuffer ) + METHOD GetCnnOptions( nType ) + METHOD Commit() + METHOD RollBack() + METHOD SetStmtOptions( nType, uBuffer ) + METHOD GetStmtOptions( nType ) METHOD SetAutocommit( lEnable ) ENDCLASS @@ -259,8 +259,8 @@ RETURN ( NIL ) METHOD GetCnnOptions( nType ) CLASS TODBC - local cBuffer:=space(256) - ::nRetCode := SQLGETCONNECTOPTION( ::hDbc, nType, @cBuffer ) + local cBuffer:=space(256) + ::nRetCode := SQLGETCONNECTOPTION( ::hDbc, nType, @cBuffer ) return cBuffer @@ -286,7 +286,7 @@ return ( ::nRetCode := SQLRollBack( ::hEnv, ::hDbc ) ) METHOD GetStmtOptions( nType ) CLASS TODBC - local cBuffer := Space( 256 ) + local cBuffer := Space( 256 ) ::nRetCode := SQLGetStmtOption( ::hStmt, nType, @cBuffer ) diff --git a/harbour/contrib/ole2/w32ole.c b/harbour/contrib/ole2/w32ole.c index 52b5043635..c4b977adc9 100644 --- a/harbour/contrib/ole2/w32ole.c +++ b/harbour/contrib/ole2/w32ole.c @@ -1582,7 +1582,7 @@ static void TraceLog( const char * sFile, const char * sTraceMsg, ... ) s_nOleError = CoCreateInstance( (REFCLSID) &ClassID, NULL, CLSCTX_SERVER, (REFIID) riid, &pDisp ); // TraceLog( NULL, "Result: %p\n", s_nOleError ); } - + hb_retnl( ( LONG ) pDisp ); } @@ -2052,7 +2052,7 @@ static void TraceLog( const char * sFile, const char * sTraceMsg, ... ) PHB_ITEM pReturn = hb_itemNew( NULL ); PHB_ITEM pOleClassName = hb_itemNew( NULL ); char *sOleClassName; - int iClassNameLen, iMsgNameLen; + int iClassNameLen, iMsgNameLen; hb_itemForwardValue( pReturn, hb_stackReturnItem() ); @@ -2063,7 +2063,7 @@ static void TraceLog( const char * sFile, const char * sTraceMsg, ... ) iClassNameLen = hb_parclen( -1 ); iMsgNameLen = strlen( hb_itemGetSymbol( hb_stackBaseItem() )->szName ); - sOleClassName = (char *) hb_xgrab( iClassNameLen + 1 + iMsgNameLen + 1 ); + sOleClassName = (char *) hb_xgrab( iClassNameLen + 1 + iMsgNameLen + 1 ); strncpy( sOleClassName, hb_parc( - 1 ), iClassNameLen ); sOleClassName[ iClassNameLen ] = ':'; diff --git a/harbour/harbour.spec b/harbour/harbour.spec index 14a136f98d..bd1ec693fb 100644 --- a/harbour/harbour.spec +++ b/harbour/harbour.spec @@ -109,7 +109,7 @@ Requires: gcc binutils bash sh-utils %{name}-lib = %{?epoch:%{epoch}:}%{ve Provides: %{name} harbour BuildRoot: /tmp/%{name}-%{version}-root -%define _noautoreq 'libharbour.*' +%define _noautoreq 'libharbour.*' %description %{dname} is a CA-Clipper compatible compiler for multiple platforms. This diff --git a/harbour/hbgtmk.sh b/harbour/hbgtmk.sh index 36b84a6820..9dccc1c1ab 100755 --- a/harbour/hbgtmk.sh +++ b/harbour/hbgtmk.sh @@ -35,9 +35,9 @@ if ! which ${_cvs_RSH} &>/dev/null then if [ "${_cvs_RSH}" = "ssh" ] then - TOINST_LST="${TOINST_LST} [open]ssh-clients" + TOINST_LST="${TOINST_LST} [open]ssh-clients" else - TOINST_LST="${TOINST_LST} ${_cvs_RSH}" + TOINST_LST="${TOINST_LST} ${_cvs_RSH}" fi fi @@ -47,8 +47,8 @@ then mkdir -p CVS cd CVS if cvs -z3 co "${PROJECT}"; then - cd "${PROJECT}" - ./make_rpm.sh "$*" + cd "${PROJECT}" + ./make_rpm.sh "$*" fi else echo "If you want to build Harbour compilers" diff --git a/harbour/include/hbexpra.c b/harbour/include/hbexpra.c index 3544704309..d4feec1710 100644 --- a/harbour/include/hbexpra.c +++ b/harbour/include/hbexpra.c @@ -135,7 +135,7 @@ HB_EXPR_PTR hb_compExprNewFunCall( HB_EXPR_PTR pName, HB_EXPR_PTR pParms, HB_COM iCount = ( int ) hb_compExprParamListLen( pParms ); /* TODO: EMPTY() (not done by Clipper) */ - if( iCount == 0 ) + if( iCount == 0 ) { #if !defined( HB_MACRO_SUPPORT ) && defined( HB_COMPAT_XHB ) if( strcmp( "HB_ENUMINDEX", pName->value.asSymbol ) == 0 ) diff --git a/harbour/include/hbexprb.c b/harbour/include/hbexprb.c index 6df6654420..b2f58eabe2 100644 --- a/harbour/include/hbexprb.c +++ b/harbour/include/hbexprb.c @@ -407,7 +407,7 @@ static HB_EXPR_FUNC( hb_compExprUseCodeblock ) break; case HB_EA_PUSH_PCODE: { -#if defined(HB_MACRO_SUPPORT) +#if defined(HB_MACRO_SUPPORT) HB_EXPR_PCODE1( hb_compExprCodeblockPush, pSelf ); #else if( pSelf->value.asCodeblock.flags & HB_BLOCK_EXT ) diff --git a/harbour/include/hbmath.ch b/harbour/include/hbmath.ch index 70c11b4df6..2fad3c075b 100644 --- a/harbour/include/hbmath.ch +++ b/harbour/include/hbmath.ch @@ -71,7 +71,7 @@ #define HB_MATH_ERRMODE_USER 2 /* throw Harbour error, user MUST correct math error within Harbour error handling */ #define HB_MATH_ERRMODE_USERDEFAULT 3 /* dito, but if user does not correct math error, default - error handling, i.e. by individual function applies */ + error handling, i.e. by individual function applies */ #define HB_MATH_ERRMODE_USERCDEFAULT 4 /* as ERRMODE_USER, but if user does not correct math error, C RTL correction values are used */ diff --git a/harbour/include/hbrddntx.h b/harbour/include/hbrddntx.h index b8436bc7d5..11720f2619 100644 --- a/harbour/include/hbrddntx.h +++ b/harbour/include/hbrddntx.h @@ -94,7 +94,7 @@ HB_EXTERN_BEGIN #define NTX_TAGITEMSIZE 16 /* Size of tag item in CTX header */ #define NTX_HDR_UNUSED 473 /* the unused part of header */ #define NTX_PAGES_PER_TAG 8 -#define NTX_STACKSIZE 32 /* Maximum page stack size */ +#define NTX_STACKSIZE 32 /* Maximum page stack size */ /* index file structures - defined as BYTEs to avoid alignment problems */ diff --git a/harbour/make_rpm.sh b/harbour/make_rpm.sh index 0cd0767f3e..6555513f4b 100755 --- a/harbour/make_rpm.sh +++ b/harbour/make_rpm.sh @@ -157,9 +157,9 @@ then if [ "${BUGGY_RPM}" = "yes" ] then cp ${hb_filename} ${RPMDIR}/SOURCES - cp harbour.spec ${RPMDIR}/SPECS + cp harbour.spec ${RPMDIR}/SPECS fi - if which rpmbuild &>/dev/null + if which rpmbuild &>/dev/null then RPMBLD="rpmbuild" else diff --git a/harbour/make_tgz.sh b/harbour/make_tgz.sh index e026f4415e..f656520302 100755 --- a/harbour/make_tgz.sh +++ b/harbour/make_tgz.sh @@ -92,7 +92,7 @@ case "$HB_ARCHITECTURE" in [ -z "$HB_INSTALL_PREFIX" ] && HB_INSTALL_PREFIX="/usr/local" HB_INSTALL_GROUP=wheel ETC="/private/etc" - ;; + ;; linux) [ -z "$HB_INSTALL_PREFIX" ] && HB_INSTALL_PREFIX="/usr" [ -d "$HB_INSTALL_PREFIX/lib64" ] && [ "${HB_ARCH64}" = yes ] && HB_LIBDIRNAME="lib64" diff --git a/harbour/makefile.gc b/harbour/makefile.gc index 368f1aaca6..98dcf9ceff 100644 --- a/harbour/makefile.gc +++ b/harbour/makefile.gc @@ -14,46 +14,46 @@ # # NOTE: You can use these envvars to configure the make process: -# (note that these are all optional) +# (note that these are all optional) # -# CFLAGS - Extra C compiler options for libraries and for -# executables -# C_USR - Extra C compiler options for libraries and for -# executables (GNU make compatible envvar) -# CLIBFLAGS - Extra C compiler options for the static libraries -# CLIBFLAGSDLL - Extra C compiler options for the shared libraries +# CFLAGS - Extra C compiler options for libraries and for +# executables +# C_USR - Extra C compiler options for libraries and for +# executables (GNU make compatible envvar) +# CLIBFLAGS - Extra C compiler options for the static libraries +# CLIBFLAGSDLL - Extra C compiler options for the shared libraries # -# LDFLAGS - Extra linker options for the static libraries -# LDFLAGSDLL - Extra linker options for the shared libraries +# LDFLAGS - Extra linker options for the static libraries +# LDFLAGSDLL - Extra linker options for the shared libraries # -# HARBOURFLAGS - Extra Harbour compiler options for static libs/exes -# HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries -# PRG_USR - Extra Harbour compiler options -# (GNU make compatible envvar) -# HB_GT_DEFAULT - The default GT driver, Choose between : -# gtstd (default),gtcgi,gtpca,gttrm,gtcrs,gtsln,gtxwc -# HB_GT_LIB - Set if you want to override the default GT driver -# (search for HB_GT_LIBS for a list of values) +# HARBOURFLAGS - Extra Harbour compiler options for static libs/exes +# HARBOURFLAGSDLL - Extra Harbour compiler options for shared libraries +# PRG_USR - Extra Harbour compiler options +# (GNU make compatible envvar) +# HB_GT_DEFAULT - The default GT driver, Choose between : +# gtstd (default),gtcgi,gtpca,gttrm,gtcrs,gtsln,gtxwc +# HB_GT_LIB - Set if you want to override the default GT driver +# (search for HB_GT_LIBS for a list of values) # -# HB_GPM_MOUSE - If set to yes enables using GPM mouse driver on console -# HB_WITHOUT_GTSLN - If set to yes causes to not build gtsln -# (if you don't have slang installed) +# HB_GPM_MOUSE - If set to yes enables using GPM mouse driver on console +# HB_WITHOUT_GTSLN - If set to yes causes to not build gtsln +# (if you don't have slang installed) # -# HB_COMMERCE - If set to yes disables pure GNU modules (slang,GPM,...) -# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL -# dll in addition to normal static build (currently not working) -# HB_BUILD_DEBUG - If set to yes causes to compile with debug info -# HB_BUILD_VERBOSE - enables echoing commands being executed -# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by -# bison (you must use bison 2.3 or later) +# HB_COMMERCE - If set to yes disables pure GNU modules (slang,GPM,...) +# HB_BUILD_DLL - If set to yes enables building harbour VM+RTL +# dll in addition to normal static build (currently not working) +# HB_BUILD_DEBUG - If set to yes causes to compile with debug info +# HB_BUILD_VERBOSE - enables echoing commands being executed +# HB_REBUILD_PARSER - If set to yes force preprocessing new rules by +# bison (you must use bison 2.3 or later) # -# HB_INSTALL_PREFIX - Path to instalation directory into which -# Harbour will be installed when the command -# "make_gcc.bat install" is lauched. Defaults -# to current directory +# HB_INSTALL_PREFIX - Path to instalation directory into which +# Harbour will be installed when the command +# "make_gcc.bat install" is lauched. Defaults +# to current directory # -# HB_DOC_PDF - Turns on the .PDF file support in the HBDOC utility. -# Note that this will require the pdflib contrib. +# HB_DOC_PDF - Turns on the .PDF file support in the HBDOC utility. +# Note that this will require the pdflib contrib. # --------------------------------------------------------------- diff --git a/harbour/source/common/expropt2.c b/harbour/source/common/expropt2.c index 4dcb1c6f66..9f50259798 100644 --- a/harbour/source/common/expropt2.c +++ b/harbour/source/common/expropt2.c @@ -456,7 +456,7 @@ HB_EXPR_PTR hb_compExprReduceMinus( HB_EXPR_PTR pSelf, HB_COMP_DECL ) { pSelf->ExprType = HB_ET_NONE; /* suppress deletion of operator components */ HB_COMP_EXPR_FREE( pSelf ); - pSelf = hb_compExprReduceMinusStrings( pLeft, pRight, HB_COMP_PARAM ); + pSelf = hb_compExprReduceMinusStrings( pLeft, pRight, HB_COMP_PARAM ); } } } @@ -638,7 +638,7 @@ HB_EXPR_PTR hb_compExprReducePlus( HB_EXPR_PTR pSelf, HB_COMP_DECL ) { pSelf->ExprType = HB_ET_NONE; /* suppress deletion of operator components */ HB_COMP_EXPR_FREE( pSelf ); - pSelf = hb_compExprReducePlusStrings( pLeft, pRight, HB_COMP_PARAM ); + pSelf = hb_compExprReducePlusStrings( pLeft, pRight, HB_COMP_PARAM ); } } } diff --git a/harbour/source/debug/dbgtobj.prg b/harbour/source/debug/dbgtobj.prg index f0e9bdbc29..0dc1ef1b56 100644 --- a/harbour/source/debug/dbgtobj.prg +++ b/harbour/source/debug/dbgtobj.prg @@ -236,10 +236,10 @@ method SetsKeyPressed( nKey, oBrwSets, nSets, oWnd ,cName,LenArr,aArray) class t endif elseif valtype(aArray[nSet,2])=="O" tdbgObject():New(aArray[nSet,2],::pitems[nSet,1]) - elseif ( ( ValType( aArray[ nSet, 2 ] ) == "C" ; - .AND. aArray[ nSet, 2 ] == "Method" ) ; - .OR. ValType( aArray[ nSet, 2 ] ) == "B"; - .OR. ValType( aArray[ nSet, 2 ] ) == "P" ) + elseif ( ValType( aArray[ nSet, 2 ] ) == "C" .AND. ; + aArray[ nSet, 2 ] == "Method" ) .OR. ; + ValType( aArray[ nSet, 2 ] ) == "B" .OR. ; + ValType( aArray[ nSet, 2 ] ) == "P" Alert("Value cannot be edited") else diff --git a/harbour/source/debug/dbgwa.prg b/harbour/source/debug/dbgwa.prg index 71f12596f4..9b6e7c7988 100644 --- a/harbour/source/debug/dbgwa.prg +++ b/harbour/source/debug/dbgwa.prg @@ -74,12 +74,12 @@ function __dbgShowWorkAreas() /* We can't determine the last used area, so use 512 here */ for n1 := 1 to 512 - if ( n1 )->( Used() ) - AAdd(aAlias, { n1, Alias(n1) }) - if n1 == nOldArea - cur_id = Len(aAlias) - endif - endif + if ( n1 )->( Used() ) + AAdd(aAlias, { n1, Alias(n1) }) + if n1 == nOldArea + cur_id = Len(aAlias) + endif + endif next if len( aAlias ) == 0 diff --git a/harbour/source/pp/ppcore.c b/harbour/source/pp/ppcore.c index 7baecda3ef..4492b5f341 100644 --- a/harbour/source/pp/ppcore.c +++ b/harbour/source/pp/ppcore.c @@ -1381,7 +1381,7 @@ static void hb_pp_getLine( PHB_PP_STATE pState ) if( pOperator ) { hb_pp_tokenAddNext( pState, pOperator->value, - strlen( pOperator->value ), + strlen( pOperator->value ), pOperator->type ); ul = pOperator->len; } diff --git a/harbour/source/rdd/dbfcdx/dbfcdx1.c b/harbour/source/rdd/dbfcdx/dbfcdx1.c index 0e8cfb275f..81a714ccd7 100644 --- a/harbour/source/rdd/dbfcdx/dbfcdx1.c +++ b/harbour/source/rdd/dbfcdx/dbfcdx1.c @@ -1731,7 +1731,7 @@ static void hb_cdxPageCheckDupTrl( LPCDXPAGE pPage, BYTE * pKeyBuf, SHORT iKeys, printf( "\r\npbValPrev=[%s] pbVal=[%s], [%d], pKeyBuf=%p", &pKeyBuf[ iPos - iLen ], &pKeyBuf[ iPos ], memcmp( &pKeyBuf[ iPos - iLen ], &pKeyBuf[ iPos ], iNum ), - pKeyBuf ); + pKeyBuf ); fflush(stdout); bErr = TRUE; } @@ -2025,7 +2025,7 @@ static int hb_cdxPageLeafDelKey( LPCDXPAGE pPage ) printf("\r\ndelkey: Page=%lx, iKey=%d/%d, rec=%ld, iFree=%d", pPage->Page, iKey, pPage->iKeys, (ULONG) HB_GET_LE_UINT32( &pPage->pKeyBuf[ ( iKey + 1 ) * iLen - 6 ] ), - pPage->iFree ); + pPage->iFree ); fflush(stdout); #endif iSpc = pPage->ReqByte + pPage->TagParent->uiLen - diff --git a/harbour/source/rdd/dbffpt/dbffpt1.c b/harbour/source/rdd/dbffpt/dbffpt1.c index 4187d63884..0430d8358a 100644 --- a/harbour/source/rdd/dbffpt/dbffpt1.c +++ b/harbour/source/rdd/dbffpt/dbffpt1.c @@ -438,7 +438,7 @@ static ERRCODE hb_fptPutRootBlock( FPTAREAP pArea, ULONG ulBlock ) nItem is always odd and after read we have to recalculate it: nItem = ( nItem - 3 ) / 4 - if FPTHEADER->flexDir = 0 then we can create it by allocating + if FPTHEADER->flexDir = 0 then we can create it by allocating two 1024 bytes pages for flexRev and flexDir page. FPTHEADER->flexRev[4] 1024 bytes in next free block FPTHEADER->flexDir[4] next 1024 bytes @@ -2165,7 +2165,7 @@ static ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBu if ( bBufEnd - (*pbMemoBuf) >= 3 ) { hb_itemPutNILen( pItem, ( SHORT ) HB_GET_LE_UINT16( *pbMemoBuf ), - (*pbMemoBuf)[2] ); + (*pbMemoBuf)[2] ); *pbMemoBuf += 3; } else @@ -2208,7 +2208,7 @@ static ERRCODE hb_fptReadFlexItem( FPTAREAP pArea, BYTE ** pbMemoBuf, BYTE * bBu if ( bBufEnd - (*pbMemoBuf) >= 3 ) { hb_itemPutNIntLen( pItem, ( USHORT ) HB_GET_LE_UINT16( *pbMemoBuf ), - (*pbMemoBuf)[2] ); + (*pbMemoBuf)[2] ); *pbMemoBuf += 3; } else diff --git a/harbour/source/rtl/gtalleg/fixedth.sfc b/harbour/source/rtl/gtalleg/fixedth.sfc index 21637bdce4..20cd20cfb6 100644 --- a/harbour/source/rtl/gtalleg/fixedth.sfc +++ b/harbour/source/rtl/gtalleg/fixedth.sfc @@ -1108,35 +1108,35 @@ static ssfGlyph g223 = { static ssfGlyph *ssfFixedThinChars[] = { &g000, - &g000, // 1 - &g000, // 2 - &g000, // 3 - &g000, // 4 - &g000, // 5 - &g000, // 6 - &g000, // 7 - &g000, // 8 - &g000, // 9 - &g000, // 10 - &g000, // 11 - &g000, // 12 - &g000, // 13 - &g000, // 14 - &g000, // 15 + &g000, // 1 + &g000, // 2 + &g000, // 3 + &g000, // 4 + &g000, // 5 + &g000, // 6 + &g000, // 7 + &g000, // 8 + &g000, // 9 + &g000, // 10 + &g000, // 11 + &g000, // 12 + &g000, // 13 + &g000, // 14 + &g000, // 15 &g016, &g017, - &g000, // 18 - &g000, // 19 - &g000, // 20 - &g000, // 21 - &g000, // 22 - &g000, // 23 - &g000, // 24 - &g000, // 25 - &g000, // 26 - &g000, // 27 - &g000, // 28 - &g000, // 29 + &g000, // 18 + &g000, // 19 + &g000, // 20 + &g000, // 21 + &g000, // 22 + &g000, // 23 + &g000, // 24 + &g000, // 25 + &g000, // 26 + &g000, // 27 + &g000, // 28 + &g000, // 29 &g030, &g031, &g032, @@ -1234,39 +1234,39 @@ static ssfGlyph *ssfFixedThinChars[] = { &g124, &g125, &g126, - &g000, // 127 - &g000, // 128 - &g000, // 129 + &g000, // 127 + &g000, // 128 + &g000, // 129 &g130, - &g000, // 131 - &g000, // 132 - &g000, // 133 - &g000, // 134 - &g000, // 135 - &g000, // 136 - &g000, // 137 - &g000, // 138 - &g000, // 139 - &g000, // 140 - &g000, // 141 - &g000, // 142 - &g000, // 143 - &g000, // 144 - &g000, // 145 - &g000, // 146 - &g000, // 147 - &g000, // 148 - &g000, // 149 - &g000, // 150 - &g000, // 151 - &g000, // 152 - &g000, // 153 - &g000, // 154 - &g000, // 155 - &g000, // 156 - &g000, // 157 - &g000, // 158 - &g000, // 159 + &g000, // 131 + &g000, // 132 + &g000, // 133 + &g000, // 134 + &g000, // 135 + &g000, // 136 + &g000, // 137 + &g000, // 138 + &g000, // 139 + &g000, // 140 + &g000, // 141 + &g000, // 142 + &g000, // 143 + &g000, // 144 + &g000, // 145 + &g000, // 146 + &g000, // 147 + &g000, // 148 + &g000, // 149 + &g000, // 150 + &g000, // 151 + &g000, // 152 + &g000, // 153 + &g000, // 154 + &g000, // 155 + &g000, // 156 + &g000, // 157 + &g000, // 158 + &g000, // 159 &g160, &g161, &g162, @@ -1276,28 +1276,28 @@ static ssfGlyph *ssfFixedThinChars[] = { &g166, &g167, &g168, - &g000, // 169 - &g000, // 170 - &g000, // 171 - &g000, // 172 + &g000, // 169 + &g000, // 170 + &g000, // 171 + &g000, // 172 &g173, - &g000, // 174 - &g000, // 175 + &g000, // 174 + &g000, // 175 &g176, &g177, &g178, &g179, &g180, - &g000, // 181 - &g000, // 182 - &g000, // 183 - &g000, // 184 - &g180, // 185 - &g179, // 186 - &g191, // 187 - &g217, // 188 - &g000, // 189 - &g000, // 190 + &g000, // 181 + &g000, // 182 + &g000, // 183 + &g000, // 184 + &g180, // 185 + &g179, // 186 + &g191, // 187 + &g217, // 188 + &g000, // 189 + &g000, // 190 &g191, &g192, &g193, @@ -1305,67 +1305,67 @@ static ssfGlyph *ssfFixedThinChars[] = { &g195, &g196, &g197, - &g000, // 198 - &g000, // 199 - &g192, // 200 - &g218, // 201 - &g193, // 202 - &g194, // 203 - &g195, // 204 - &g196, // 205 - &g197, // 206 - &g000, // 207 - &g000, // 208 - &g000, // 209 - &g000, // 210 - &g000, // 211 - &g000, // 212 - &g000, // 213 - &g000, // 214 - &g000, // 215 - &g000, // 216 + &g000, // 198 + &g000, // 199 + &g192, // 200 + &g218, // 201 + &g193, // 202 + &g194, // 203 + &g195, // 204 + &g196, // 205 + &g197, // 206 + &g000, // 207 + &g000, // 208 + &g000, // 209 + &g000, // 210 + &g000, // 211 + &g000, // 212 + &g000, // 213 + &g000, // 214 + &g000, // 215 + &g000, // 216 &g217, &g218, &g219, &g220, - &g000, // 221 - &g000, // 222 + &g000, // 221 + &g000, // 222 &g223, - &g000, // 224 - &g000, // 225 - &g000, // 226 - &g000, // 227 - &g000, // 228 - &g000, // 229 - &g000, // 230 - &g000, // 231 - &g000, // 232 - &g000, // 233 - &g000, // 234 - &g000, // 235 - &g000, // 236 - &g000, // 237 - &g000, // 238 - &g000, // 239 - &g000, // 240 - &g000, // 241 - &g000, // 242 - &g000, // 243 - &g000, // 244 - &g000, // 245 - &g000, // 246 - &g000, // 247 - &g000, // 248 - &g000, // 249 - &g000, // 250 - &g000, // 251 - &g000, // 252 - &g000, // 253 - &g000, // 254 - &g000, // 255 + &g000, // 224 + &g000, // 225 + &g000, // 226 + &g000, // 227 + &g000, // 228 + &g000, // 229 + &g000, // 230 + &g000, // 231 + &g000, // 232 + &g000, // 233 + &g000, // 234 + &g000, // 235 + &g000, // 236 + &g000, // 237 + &g000, // 238 + &g000, // 239 + &g000, // 240 + &g000, // 241 + &g000, // 242 + &g000, // 243 + &g000, // 244 + &g000, // 245 + &g000, // 246 + &g000, // 247 + &g000, // 248 + &g000, // 249 + &g000, // 250 + &g000, // 251 + &g000, // 252 + &g000, // 253 + &g000, // 254 + &g000, // 255 }; static ssfFont ssfFixedThinFont = { - 16, // default pitch - ssfFixedThinChars // chars + 16, // default pitch + ssfFixedThinChars // chars }; diff --git a/harbour/source/rtl/gtalleg/gtalleg.c b/harbour/source/rtl/gtalleg/gtalleg.c index 983d365335..bb145061de 100644 --- a/harbour/source/rtl/gtalleg/gtalleg.c +++ b/harbour/source/rtl/gtalleg/gtalleg.c @@ -881,7 +881,7 @@ static BOOL hb_gt_alleg_Info( int iType, PHB_GT_INFO pInfo ) pInfo->pResult = hb_itemPutNI( pInfo->pResult, al_key_shifts ); if( hb_itemType( pInfo->pNewVal ) & HB_IT_NUMERIC ) { - al_set_keyboard_leds( hb_itemGetNI( pInfo->pNewVal ) ); + al_set_keyboard_leds( hb_itemGetNI( pInfo->pNewVal ) ); } break; diff --git a/harbour/source/rtl/gtalleg/ssf.h b/harbour/source/rtl/gtalleg/ssf.h index 40ff7c4e07..cc20324ecf 100644 --- a/harbour/source/rtl/gtalleg/ssf.h +++ b/harbour/source/rtl/gtalleg/ssf.h @@ -212,10 +212,10 @@ typedef enum { #define SSF_MAXFRAMES 128 #endif -#define THICK_LEFT 0 -#define THICK_UP 1 -#define THICK_RIGHT 2 -#define THICK_DOWN 3 +#define THICK_LEFT 0 +#define THICK_UP 1 +#define THICK_RIGHT 2 +#define THICK_DOWN 3 typedef struct _ssfFrame { char ftype; diff --git a/harbour/source/rtl/gtcgi/gtcgi.c b/harbour/source/rtl/gtcgi/gtcgi.c index b11c2bc59e..706278a13e 100644 --- a/harbour/source/rtl/gtcgi/gtcgi.c +++ b/harbour/source/rtl/gtcgi/gtcgi.c @@ -52,7 +52,7 @@ /* NOTE: User programs should never call this layer directly! */ -#define HB_GT_NAME CGI +#define HB_GT_NAME CGI /* * HB_GT_CGI_RAWOUTPUT controls the behavior of GTCGI output diff --git a/harbour/source/rtl/gtchrmap.c b/harbour/source/rtl/gtchrmap.c index 3bc4f86c1c..2c1e5f22b8 100644 --- a/harbour/source/rtl/gtchrmap.c +++ b/harbour/source/rtl/gtchrmap.c @@ -60,7 +60,7 @@ #include #include -#define MAX_CHAR_VAL 0xff +#define MAX_CHAR_VAL 0xff #define HB_CHRMAP(a,c) ( ( (a) << 16 ) | (c) ) char * s_szDefaultCharMapFile = "/etc/harbour/hb-charmap.def"; diff --git a/harbour/source/rtl/gtcrs/gtcrs.h b/harbour/source/rtl/gtcrs/gtcrs.h index 07b2699fd6..fefe818bc7 100644 --- a/harbour/source/rtl/gtcrs/gtcrs.h +++ b/harbour/source/rtl/gtcrs/gtcrs.h @@ -54,7 +54,7 @@ /* *********************************************************************** */ -#define HB_GT_NAME CRS +#define HB_GT_NAME CRS #include "hbgtcore.h" #include "hbinit.h" @@ -124,28 +124,28 @@ /* #define HB_GT_CRS_TTYHACK */ -#define MAX_SIGNO 64 +#define MAX_SIGNO 64 -#define BASE_INFD 0 -#define BASE_OUTFD 1 -#define BASE_ERRFD 2 -#define MAXFD 1024 +#define BASE_INFD 0 +#define BASE_OUTFD 1 +#define BASE_ERRFD 2 +#define MAXFD 1024 -#define ESC_DELAY 25 -/* #define DBLCLK_DELAY 250 */ -#define DBLCLK_DELAY hb_mouse_GetDoubleClickSpeed(); +#define ESC_DELAY 25 +/* #define DBLCLK_DELAY 250 */ +#define DBLCLK_DELAY hb_mouse_GetDoubleClickSpeed(); -#define MAX_IOBASE 32 -#define STDIN_BUFLEN 128 +#define MAX_IOBASE 32 +#define STDIN_BUFLEN 128 -#define TERM_LINUX 1 -#define TERM_XTERM 2 +#define TERM_LINUX 1 +#define TERM_XTERM 2 -#define IS_EVTFDSTAT(x) ((x) >= 0x01 && (x) <= 0x03) -#define EVTFDSTAT_RUN 0x01 -#define EVTFDSTAT_STOP 0x02 -#define EVTFDSTAT_DEL 0x03 +#define IS_EVTFDSTAT(x) ((x) >= 0x01 && (x) <= 0x03) +#define EVTFDSTAT_RUN 0x01 +#define EVTFDSTAT_STOP 0x02 +#define EVTFDSTAT_DEL 0x03 #define CTRL_SEQ "\036" #define ALT_SEQ "\037" @@ -165,55 +165,55 @@ #define K_PAUSE 0x10007 #ifndef SC_UNDEF -# define SC_UNDEF -1 +# define SC_UNDEF -1 #endif -#define KEY_ALTMASK 0x10000000 -#define KEY_CTRLMASK 0x20000000 -#define KEY_EXTDMASK 0x40000000 -#define KEY_CLIPMASK 0x80000000 -#define KEY_MASK 0xF0000000 +#define KEY_ALTMASK 0x10000000 +#define KEY_CTRLMASK 0x20000000 +#define KEY_EXTDMASK 0x40000000 +#define KEY_CLIPMASK 0x80000000 +#define KEY_MASK 0xF0000000 -#define CLR_KEYMASK(x) ((x) & ~KEY_MASK) -#define GET_KEYMASK(x) ((x) & KEY_MASK) +#define CLR_KEYMASK(x) ((x) & ~KEY_MASK) +#define GET_KEYMASK(x) ((x) & KEY_MASK) -#define IS_CLIPKEY(x) ((((x) & ~0xffff) ^ KEY_CLIPMASK) == 0) -#define SET_CLIPKEY(x) (((x) & 0xffff) | KEY_CLIPMASK) -#define GET_CLIPKEY(x) ((((x) & 0x8000) ? ~0xffff : 0) | ((x) & 0xffff)) +#define IS_CLIPKEY(x) ((((x) & ~0xffff) ^ KEY_CLIPMASK) == 0) +#define SET_CLIPKEY(x) (((x) & 0xffff) | KEY_CLIPMASK) +#define GET_CLIPKEY(x) ((((x) & 0x8000) ? ~0xffff : 0) | ((x) & 0xffff)) -#define NO_STDKEYS 96 -#define NO_EXTDKEYS 30 +#define NO_STDKEYS 96 +#define NO_EXTDKEYS 30 -#define EXKEY_F1 ( 0 | KEY_EXTDMASK) -#define EXKEY_F2 ( 1 | KEY_EXTDMASK) -#define EXKEY_F3 ( 2 | KEY_EXTDMASK) -#define EXKEY_F4 ( 3 | KEY_EXTDMASK) -#define EXKEY_F5 ( 4 | KEY_EXTDMASK) -#define EXKEY_F6 ( 5 | KEY_EXTDMASK) -#define EXKEY_F7 ( 6 | KEY_EXTDMASK) -#define EXKEY_F8 ( 7 | KEY_EXTDMASK) -#define EXKEY_F9 ( 8 | KEY_EXTDMASK) -#define EXKEY_F10 ( 9 | KEY_EXTDMASK) -#define EXKEY_F11 (10 | KEY_EXTDMASK) -#define EXKEY_F12 (11 | KEY_EXTDMASK) -#define EXKEY_UP (12 | KEY_EXTDMASK) -#define EXKEY_DOWN (13 | KEY_EXTDMASK) -#define EXKEY_LEFT (14 | KEY_EXTDMASK) -#define EXKEY_RIGHT (15 | KEY_EXTDMASK) -#define EXKEY_INS (16 | KEY_EXTDMASK) -#define EXKEY_DEL (17 | KEY_EXTDMASK) -#define EXKEY_HOME (18 | KEY_EXTDMASK) -#define EXKEY_END (19 | KEY_EXTDMASK) -#define EXKEY_PGUP (20 | KEY_EXTDMASK) -#define EXKEY_PGDN (21 | KEY_EXTDMASK) -#define EXKEY_BS (22 | KEY_EXTDMASK) -#define EXKEY_TAB (23 | KEY_EXTDMASK) -#define EXKEY_ESC (24 | KEY_EXTDMASK) -#define EXKEY_ENTER (25 | KEY_EXTDMASK) -#define EXKEY_KPENTER (26 | KEY_EXTDMASK) -#define EXKEY_CENTER (27 | KEY_EXTDMASK) -#define EXKEY_PRTSCR (28 | KEY_EXTDMASK) -#define EXKEY_PAUSE (29 | KEY_EXTDMASK) +#define EXKEY_F1 ( 0 | KEY_EXTDMASK) +#define EXKEY_F2 ( 1 | KEY_EXTDMASK) +#define EXKEY_F3 ( 2 | KEY_EXTDMASK) +#define EXKEY_F4 ( 3 | KEY_EXTDMASK) +#define EXKEY_F5 ( 4 | KEY_EXTDMASK) +#define EXKEY_F6 ( 5 | KEY_EXTDMASK) +#define EXKEY_F7 ( 6 | KEY_EXTDMASK) +#define EXKEY_F8 ( 7 | KEY_EXTDMASK) +#define EXKEY_F9 ( 8 | KEY_EXTDMASK) +#define EXKEY_F10 ( 9 | KEY_EXTDMASK) +#define EXKEY_F11 (10 | KEY_EXTDMASK) +#define EXKEY_F12 (11 | KEY_EXTDMASK) +#define EXKEY_UP (12 | KEY_EXTDMASK) +#define EXKEY_DOWN (13 | KEY_EXTDMASK) +#define EXKEY_LEFT (14 | KEY_EXTDMASK) +#define EXKEY_RIGHT (15 | KEY_EXTDMASK) +#define EXKEY_INS (16 | KEY_EXTDMASK) +#define EXKEY_DEL (17 | KEY_EXTDMASK) +#define EXKEY_HOME (18 | KEY_EXTDMASK) +#define EXKEY_END (19 | KEY_EXTDMASK) +#define EXKEY_PGUP (20 | KEY_EXTDMASK) +#define EXKEY_PGDN (21 | KEY_EXTDMASK) +#define EXKEY_BS (22 | KEY_EXTDMASK) +#define EXKEY_TAB (23 | KEY_EXTDMASK) +#define EXKEY_ESC (24 | KEY_EXTDMASK) +#define EXKEY_ENTER (25 | KEY_EXTDMASK) +#define EXKEY_KPENTER (26 | KEY_EXTDMASK) +#define EXKEY_CENTER (27 | KEY_EXTDMASK) +#define EXKEY_PRTSCR (28 | KEY_EXTDMASK) +#define EXKEY_PAUSE (29 | KEY_EXTDMASK) /* xHarbour compatible definitions */ #define K_SH_LEFT K_LEFT /* Shift-Left == Left */ @@ -231,24 +231,24 @@ /* mouse button states */ #define M_BUTTON_LEFT 0x0001 -#define M_BUTTON_RIGHT 0x0002 -#define M_BUTTON_MIDDLE 0x0004 -#define M_BUTTON_LDBLCK 0x0010 -#define M_BUTTON_RDBLCK 0x0020 -#define M_BUTTON_MDBLCK 0x0040 +#define M_BUTTON_RIGHT 0x0002 +#define M_BUTTON_MIDDLE 0x0004 +#define M_BUTTON_LDBLCK 0x0010 +#define M_BUTTON_RDBLCK 0x0020 +#define M_BUTTON_MDBLCK 0x0040 #define M_BUTTON_WHEELUP 0x0100 #define M_BUTTON_WHEELDOWN 0x0200 #define M_CURSOR_MOVE 0x0400 #define M_BUTTON_KEYMASK (M_BUTTON_LEFT | M_BUTTON_RIGHT | M_BUTTON_MIDDLE) #define M_BUTTON_DBLMASK (M_BUTTON_LDBLCK | M_BUTTON_RDBLCK | M_BUTTON_MDBLCK) -#define TIMEVAL_GET(tv) gettimeofday(&(tv), NULL); -#define TIMEVAL_LESS(tv1, tv2) (((tv1).tv_sec == (tv2).tv_sec ) ? \ - ((tv1).tv_usec < (tv2).tv_usec) : \ - ((tv1).tv_sec < (tv2).tv_sec )) -#define TIMEVAL_ADD(dst, src, n) { \ - (dst).tv_sec = (src).tv_sec + n / 1000; \ - if (((dst).tv_usec = (src).tv_usec+(n%1000)*1000)>=1000000) { \ - (dst).tv_usec -= 1000000; (dst).tv_sec++; \ - } \ - } +#define TIMEVAL_GET(tv) gettimeofday(&(tv), NULL); +#define TIMEVAL_LESS(tv1, tv2) (((tv1).tv_sec == (tv2).tv_sec ) ? \ + ((tv1).tv_usec < (tv2).tv_usec) : \ + ((tv1).tv_sec < (tv2).tv_sec )) +#define TIMEVAL_ADD(dst, src, n) { \ + (dst).tv_sec = (src).tv_sec + n / 1000; \ + if (((dst).tv_usec = (src).tv_usec+(n%1000)*1000)>=1000000) { \ + (dst).tv_usec -= 1000000; (dst).tv_sec++; \ + } \ + } diff --git a/harbour/source/rtl/gtdos/gtdos.c b/harbour/source/rtl/gtdos/gtdos.c index 0bb3c0cbaf..1eef50cf67 100644 --- a/harbour/source/rtl/gtdos/gtdos.c +++ b/harbour/source/rtl/gtdos/gtdos.c @@ -89,7 +89,7 @@ /* NOTE: User programs should never call this layer directly! */ -#define HB_GT_NAME DOS +#define HB_GT_NAME DOS #include "hbgtcore.h" #include "hbinit.h" diff --git a/harbour/source/rtl/gtpca/gtpca.c b/harbour/source/rtl/gtpca/gtpca.c index 19cae9fca7..12a156d9d8 100644 --- a/harbour/source/rtl/gtpca/gtpca.c +++ b/harbour/source/rtl/gtpca/gtpca.c @@ -57,7 +57,7 @@ /* NOTE: User programs should never call this layer directly! */ -#define HB_GT_NAME PCA +#define HB_GT_NAME PCA #include "hbgtcore.h" #include "hbinit.h" diff --git a/harbour/source/rtl/gtsln/gtsln.h b/harbour/source/rtl/gtsln/gtsln.h index 51da05b33b..dcdee5c5cf 100644 --- a/harbour/source/rtl/gtsln/gtsln.h +++ b/harbour/source/rtl/gtsln/gtsln.h @@ -54,7 +54,7 @@ /* *********************************************************************** */ -#define HB_GT_NAME SLN +#define HB_GT_NAME SLN #include "hbgtcore.h" #include "hbinit.h" @@ -184,27 +184,27 @@ /* *********************************************************************** */ #define M_BUTTON_LEFT 0x0001 -#define M_BUTTON_RIGHT 0x0002 -#define M_BUTTON_MIDDLE 0x0004 -#define M_BUTTON_LDBLCK 0x0010 -#define M_BUTTON_RDBLCK 0x0020 -#define M_BUTTON_MDBLCK 0x0040 +#define M_BUTTON_RIGHT 0x0002 +#define M_BUTTON_MIDDLE 0x0004 +#define M_BUTTON_LDBLCK 0x0010 +#define M_BUTTON_RDBLCK 0x0020 +#define M_BUTTON_MDBLCK 0x0040 #define M_BUTTON_WHEELUP 0x0100 #define M_BUTTON_WHEELDOWN 0x0200 #define M_CURSOR_MOVE 0x0400 #define M_BUTTON_KEYMASK (M_BUTTON_LEFT | M_BUTTON_RIGHT | M_BUTTON_MIDDLE) #define M_BUTTON_DBLMASK (M_BUTTON_LDBLCK | M_BUTTON_RDBLCK | M_BUTTON_MDBLCK) -#define TIMEVAL_GET(tv) gettimeofday(&(tv), NULL); -#define TIMEVAL_LESS(tv1, tv2) (((tv1).tv_sec == (tv2).tv_sec ) ? \ - ((tv1).tv_usec < (tv2).tv_usec) : \ - ((tv1).tv_sec < (tv2).tv_sec )) -#define TIMEVAL_ADD(dst, src, n) { \ - (dst).tv_sec = (src).tv_sec + n / 1000; \ - if (((dst).tv_usec = (src).tv_usec+(n%1000)*1000)>=1000000) { \ - (dst).tv_usec -= 1000000; (dst).tv_sec++; \ - } \ - } +#define TIMEVAL_GET(tv) gettimeofday(&(tv), NULL); +#define TIMEVAL_LESS(tv1, tv2) (((tv1).tv_sec == (tv2).tv_sec ) ? \ + ((tv1).tv_usec < (tv2).tv_usec) : \ + ((tv1).tv_sec < (tv2).tv_sec )) +#define TIMEVAL_ADD(dst, src, n) { \ + (dst).tv_sec = (src).tv_sec + n / 1000; \ + if (((dst).tv_usec = (src).tv_usec+(n%1000)*1000)>=1000000) { \ + (dst).tv_usec -= 1000000; (dst).tv_sec++; \ + } \ + } /* *********************************************************************** */ diff --git a/harbour/source/rtl/gtstd/gtstd.c b/harbour/source/rtl/gtstd/gtstd.c index 8859817326..5879ef99e0 100644 --- a/harbour/source/rtl/gtstd/gtstd.c +++ b/harbour/source/rtl/gtstd/gtstd.c @@ -52,7 +52,7 @@ /* NOTE: User programs should never call this layer directly! */ -#define HB_GT_NAME STD +#define HB_GT_NAME STD #include "hbgtcore.h" #include "hbinit.h" diff --git a/harbour/source/rtl/gttrm/gttrm.c b/harbour/source/rtl/gttrm/gttrm.c index 79ab3dc06c..5e72370e0a 100644 --- a/harbour/source/rtl/gttrm/gttrm.c +++ b/harbour/source/rtl/gttrm/gttrm.c @@ -64,7 +64,7 @@ /* NOTE: User programs should never call this layer directly! */ -#define HB_GT_NAME TRM +#define HB_GT_NAME TRM #include "hbgtcore.h" #include "hbinit.h" @@ -132,11 +132,11 @@ static HB_GT_FUNCS SuperTable; /* mouse button states */ #define M_BUTTON_LEFT 0x0001 -#define M_BUTTON_RIGHT 0x0002 -#define M_BUTTON_MIDDLE 0x0004 -#define M_BUTTON_LDBLCK 0x0010 -#define M_BUTTON_RDBLCK 0x0020 -#define M_BUTTON_MDBLCK 0x0040 +#define M_BUTTON_RIGHT 0x0002 +#define M_BUTTON_MIDDLE 0x0004 +#define M_BUTTON_LDBLCK 0x0010 +#define M_BUTTON_RDBLCK 0x0020 +#define M_BUTTON_MDBLCK 0x0040 #define M_BUTTON_WHEELUP 0x0100 #define M_BUTTON_WHEELDOWN 0x0200 #define M_CURSOR_MOVE 0x0400 diff --git a/harbour/source/rtl/gtxwc/gtxwc.h b/harbour/source/rtl/gtxwc/gtxwc.h index 9b5014ab35..8a8358d094 100644 --- a/harbour/source/rtl/gtxwc/gtxwc.h +++ b/harbour/source/rtl/gtxwc/gtxwc.h @@ -57,7 +57,7 @@ #ifndef HB_GTXWC_H #define HB_GTXWC_H -#define HB_GT_NAME XWC +#define HB_GT_NAME XWC #include "hbgtcore.h" #include "hbinit.h" diff --git a/harbour/source/rtl/hbgtcore.c b/harbour/source/rtl/hbgtcore.c index 1b3dc920d3..495166177f 100644 --- a/harbour/source/rtl/hbgtcore.c +++ b/harbour/source/rtl/hbgtcore.c @@ -56,7 +56,7 @@ * */ -#define HB_GT_NAME NUL +#define HB_GT_NAME NUL #include #include "hbgtcore.h" diff --git a/harbour/source/rtl/hbhex.c b/harbour/source/rtl/hbhex.c index f4fd51e458..444b0c8182 100644 --- a/harbour/source/rtl/hbhex.c +++ b/harbour/source/rtl/hbhex.c @@ -104,7 +104,7 @@ HB_FUNC( HB_NUMTOHEX ) iLen = 32; fDefaultLen = 1; } - + if( ISNUM( 1 ) ) ulNum = hb_parnint( 1 ); else if( ISPOINTER( 1 ) ) @@ -219,7 +219,7 @@ HB_FUNC( HB_HEXTOSTR ) iVal += c - ( 'a' - 10 ); else continue; - + if( iVal & 0x100 ) { szDest[ul++] = ( char ) iVal & 0xff; diff --git a/harbour/source/rtl/hbinet.c b/harbour/source/rtl/hbinet.c index 2810e6ef22..853edf8514 100644 --- a/harbour/source/rtl/hbinet.c +++ b/harbour/source/rtl/hbinet.c @@ -738,7 +738,7 @@ HB_FUNC( HB_INETPERIODCALLBACK ) if( pExec ) { if( Socket->caPeriodic ) - hb_itemRelease( Socket->caPeriodic ); + hb_itemRelease( Socket->caPeriodic ); Socket->caPeriodic = hb_itemClone( pExec ); } } diff --git a/harbour/source/rtl/itemseri.c b/harbour/source/rtl/itemseri.c index 0061044e9b..66e0986d9a 100644 --- a/harbour/source/rtl/itemseri.c +++ b/harbour/source/rtl/itemseri.c @@ -88,7 +88,7 @@ UCHAR [ 1 ] - item type 23. HASHREF8 1+n 24. HASHREF16 2+n 25. HASHREF32 4+n - 26. SYMBOL 1+n + 26. SYMBOL 1+n 27. CYCLIC REFERENCE 4 28. OBJECT MARKER n+1+m+1 */ diff --git a/harbour/source/rtl/tget.prg b/harbour/source/rtl/tget.prg index 2d0fd60666..9beabb516e 100644 --- a/harbour/source/rtl/tget.prg +++ b/harbour/source/rtl/tget.prg @@ -991,7 +991,7 @@ METHOD ToDecPos() CLASS Get endif return Self - + /* ------------------------------------------------------------------------- */ METHOD IsEditable( nPos ) CLASS Get diff --git a/harbour/source/vm/hvm.c b/harbour/source/vm/hvm.c index 5702393453..1d70957bee 100644 --- a/harbour/source/vm/hvm.c +++ b/harbour/source/vm/hvm.c @@ -260,14 +260,14 @@ static HB_DBGENTRY_FUNC s_pFunDbgEntry; /* C level debugger entry */ /* Various compatibility flags */ -static ULONG s_VMFlags = HB_VMFLAG_HARBOUR; +static ULONG s_VMFlags = HB_VMFLAG_HARBOUR; #undef hb_vmFlagEnabled -#define hb_vmFlagEnabled(flag) (s_VMFlags & (flag)) +#define hb_vmFlagEnabled(flag) (s_VMFlags & (flag)) /* Keycodes to stop virtual machine */ -static int s_VMCancelKey = K_ALT_C; -static int s_VMCancelKeyEx = HB_K_ALT_C; +static int s_VMCancelKey = K_ALT_C; +static int s_VMCancelKeyEx = HB_K_ALT_C; /* SEQUENCE envelope items position from stack top active */ diff --git a/harbour/tests/codebl.prg b/harbour/tests/codebl.prg index c746f87460..3240c2620d 100644 --- a/harbour/tests/codebl.prg +++ b/harbour/tests/codebl.prg @@ -37,7 +37,7 @@ LOCAL cb mqout( 4, EVAL( cb, 3 ) ) ReferParam() - + Return( NIL ) Static Function TestBlocks() diff --git a/harbour/tests/keywords.prg b/harbour/tests/keywords.prg index 377192b667..ff21d34798 100644 --- a/harbour/tests/keywords.prg +++ b/harbour/tests/keywords.prg @@ -575,7 +575,7 @@ FIEL fiel FIELD( FIEL(0) ) #ifndef HB_CLIPPER_COMPATIBLE - DO field //Incorrect number of arguments + DO field //Incorrect number of arguments DO field WITH field //field cannot be passed by a reference #endif WHILE field diff --git a/harbour/tests/testpp.prg b/harbour/tests/testpp.prg index 41328debbd..de266a5491 100644 --- a/harbour/tests/testpp.prg +++ b/harbour/tests/testpp.prg @@ -9,15 +9,15 @@ LOCAL b MEMVAR a PRIVATE a -#command _REGULAR_() => ? //REGULAR -#command _NORMAL_() => ? <"z"> //NORMAL -#command _SMART_() => ? <(z)> //SMART -#command _DUMB_() => ? # //DUMB +#command _REGULAR_() => ? //REGULAR +#command _NORMAL_() => ? <"z"> //NORMAL +#command _SMART_() => ? <(z)> //SMART +#command _DUMB_() => ? # //DUMB -#command _REGULAR_L() => s( ) -#command _NORMAL_L() => s( <"z"> ) //NORMAL -#command _SMART_L() => s( <(z)> ) //SMART -#command _DUMB_L() => s( # ) //DUMB +#command _REGULAR_L() => s( ) +#command _NORMAL_L() => s( <"z"> ) //NORMAL +#command _SMART_L() => s( <(z)> ) //SMART +#command _DUMB_L() => s( # ) //DUMB USE &b ALIAS &a.1 INDEX &a.aa, &b, &c, &b. diff --git a/harbour/tests/testprof.prg b/harbour/tests/testprof.prg index deef61ec3a..62d3a73f3e 100644 --- a/harbour/tests/testprof.prg +++ b/harbour/tests/testprof.prg @@ -77,38 +77,38 @@ Local lBrowsing := .T. Local nKey Do While lBrowsing - + oBrowse:forceStable() - + nKey := inkey( 0 ) - + Do Case - + Case nKey == K_ESC - lBrowsing := .F. - - Case nKey == K_DOWN - oBrowse:down() - - Case nKey == K_UP - oBrowse:up() - - Case nKey == K_LEFT - oBrowse:left() - - Case nKey == K_RIGHT - oBrowse:right() - - Case nKey == K_PGDN - oBrowse:pageDown() - - Case nKey == K_PGUP - oBrowse:pageUp() - - // And so on.... (not really necessary for this test) - + lBrowsing := .F. + + Case nKey == K_DOWN + oBrowse:down() + + Case nKey == K_UP + oBrowse:up() + + Case nKey == K_LEFT + oBrowse:left() + + Case nKey == K_RIGHT + oBrowse:right() + + Case nKey == K_PGDN + oBrowse:pageDown() + + Case nKey == K_PGUP + oBrowse:pageUp() + + // And so on.... (not really necessary for this test) + EndCase - + EndDo Return( NIL ) diff --git a/harbour/utils/hbpp/hbppcore.c b/harbour/utils/hbpp/hbppcore.c index d45d9795f1..62694c387d 100644 --- a/harbour/utils/hbpp/hbppcore.c +++ b/harbour/utils/hbpp/hbppcore.c @@ -4172,10 +4172,10 @@ static int IsInStr( char symb, char *s ) } /* ptri = string for inserting - ptro = output string - len1 = length of ptri string - len2 = length of ptro string that will be replaced - lenres = length of ptro string + ptro = output string + len1 = length of ptri string + len2 = length of ptro string that will be replaced + lenres = length of ptro string */ void hb_pp_Stuff( char *ptri, char *ptro, int len1, int len2, int lenres ) { diff --git a/harbour/utils/hbpptest/pp_test.prg b/harbour/utils/hbpptest/pp_test.prg index f4553ff06a..c4c16f4465 100644 --- a/harbour/utils/hbpptest/pp_test.prg +++ b/harbour/utils/hbpptest/pp_test.prg @@ -112,7 +112,7 @@ CCCC c _REGULAR_(a[1]) _REGULAR_("['']") - //NORMAL + //NORMAL /* test for normal match marker */ #command _NORMAL_M() => nm( <"z"> ) _NORMAL_M(a) @@ -127,7 +127,7 @@ CCCC c _NORMAL_M(a[1]) _NORMAL_M("['']") - //SMART + //SMART /* test for smart match marker */ #command _SMART_M() => sm( <(z)> ) _SMART_M(a) @@ -142,7 +142,7 @@ CCCC c _SMART_M(a[1]) _SMART_M("['']") - //DUMB + //DUMB /* test for dumb match marker */ #command _DUMB_M() => dm( # ) _DUMB_M(a) @@ -160,7 +160,7 @@ CCCC c /* ---------------------------------------------------------------------*/ // REGULAR list /* test for regular match marker */ -#command _REGULAR_L() => rl( ) +#command _REGULAR_L() => rl( ) _REGULAR_L(a,"a",'a',["'a'"],"['a']",'["a"]',&a.1,&a,&a.,&a. ,&(a),&a[1],&a.[1],&a. [2],&a&a, &a.a, a, a) // NORMAL list @@ -487,9 +487,9 @@ DEFINE CLIPBOARD oC OF oD FORMAT TEXT #xcommand DECLARE WINDOW ; =>; -#xtranslate . := => SProp( <"w">, <"p"> , ) +#xtranslate . := => SProp( <"w">, <"p"> , ) #xcommand DEFINE WINDOW [ON INIT ] =>; - DECLARE WINDOW ; _DW( <"w">, <{IProc}> ) + DECLARE WINDOW ; _DW( <"w">, <{IProc}> ) DEFINE WINDOW &oW DEFINE WINDOW &oW ON INIT &oW.Title:= "My title" diff --git a/harbour/utils/hbpptest/pretest.prg b/harbour/utils/hbpptest/pretest.prg index 1f1ed70a5d..e74af8beeb 100644 --- a/harbour/utils/hbpptest/pretest.prg +++ b/harbour/utils/hbpptest/pretest.prg @@ -101,7 +101,7 @@ ENDTEXT nRes += PreResult( pre, PreRun( in, pre ), @nCnt ) /*------------*/ - //REGULAR + //REGULAR in := "#command _REGULAR_() => rm( )" __PreProcess( in ) @@ -158,7 +158,7 @@ ENDTEXT nRes += PreResult( pre, PreRun( in, pre ), @nCnt ) - //NORMAL + //NORMAL in := '#command _NORMAL_M() => nm( <"z"> )' __PreProcess( in ) @@ -215,7 +215,7 @@ ENDTEXT nRes += PreResult( pre, PreRun( in, pre ), @nCnt ) - //SMART + //SMART in := '#command _SMART_M() => sm( <(z)> )' __PreProcess( in ) @@ -273,7 +273,7 @@ ENDTEXT - //DUMB + //DUMB in := '#command _DUMB_M() => dm( # )' __PreProcess( in ) @@ -332,7 +332,7 @@ ENDTEXT // REGULAR list XTEXT TO VAR in -#command _REGULAR_L() => rl( ) +#command _REGULAR_L() => rl( ) _REGULAR_L(a,"a",'a',["'a'"],"['a']",'["a"]',&a.1,&a,&a.,&a. ,&(a),&a[1],&a.[1],&a. [2],&a&a, &a.a, a, a) ENDTEXT CTEXT TO VAR pre