2007-04-01 13:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)

* harbour/makefile.bc * harbour/makefile.vc * harbour/config/rules.cf * harbour/contrib/btree/makefile.bc * harbour/contrib/htmllib/Makefile.bc * harbour/contrib/htmllib/makefile.vc * harbour/contrib/libct/makefile.bc * harbour/contrib/libct/makefile.vc * harbour/contrib/libgt/makefile.bc * harbour/contrib/libgt/makefile.vc * harbour/contrib/libmisc/makefile.bc * harbour/contrib/libmisc/makefile.vc * harbour/contrib/libnf/makefile.vc * harbour/contrib/libnf/nanfor.bc * harbour/contrib/samples/makefile.bc * harbour/contrib/samples/makefile.vc + harbour/contrib/samples/make_b32.bat + harbour/contrib/samples/make_vc.bat - harbour/contrib/samples/makevc.bat + -w default Harbour build switch changed to -w2, to further maintain code quality. ; Notice that CONTRIB might need some fixing here. + Added proper BC/VC make batch files for "samples". * harbour/include/hbclass.ch * harbour/source/debug/dbgmenu.prg * harbour/source/debug/debugger.prg * harbour/source/rtl/teditor.prg * harbour/utils/hbdoc/genchm.prg * harbour/utils/hbdoc/genhtm.prg * harbour/utils/hbdoc/genng.prg * harbour/utils/hbdoc/genos2.prg * harbour/utils/hbdoc/genpdf1.prg * harbour/utils/hbdoc/genrtf.prg * harbour/utils/hbdoc/os2.prg * harbour/utils/hbmake/hbmake.prg * harbour/utils/hbmake/radios.prg * harbour/utils/hbpptest/pretest.prg * harbour/utils/hbtest/rt_misc.prg + Added HB_SYMBOL_UNUSED() inside codeblocks. ! Removed a few uneeded codeblock parameters. + Added HB_SYMBOL_UNUSED() to some class syntax generated code to avoid unused "Self" var warnings. * harbour/ChangeLog.017 ! Typos.
2007-04-01 12:04:58 +00:00
parent 96561eeae0
commit 65460d88a1
36 changed files with 167 additions and 73 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,54 @@
   2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */

+2007-04-01 13:47 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
+   * harbour/makefile.bc
+   * harbour/makefile.vc
+   * harbour/config/rules.cf
+   * harbour/contrib/btree/makefile.bc
+   * harbour/contrib/htmllib/Makefile.bc
+   * harbour/contrib/htmllib/makefile.vc
+   * harbour/contrib/libct/makefile.bc
+   * harbour/contrib/libct/makefile.vc
+   * harbour/contrib/libgt/makefile.bc
+   * harbour/contrib/libgt/makefile.vc
+   * harbour/contrib/libmisc/makefile.bc
+   * harbour/contrib/libmisc/makefile.vc
+   * harbour/contrib/libnf/makefile.vc
+   * harbour/contrib/libnf/nanfor.bc
+   * harbour/contrib/samples/makefile.bc
+   * harbour/contrib/samples/makefile.vc
+   + harbour/contrib/samples/make_b32.bat
+   + harbour/contrib/samples/make_vc.bat
+   - harbour/contrib/samples/makevc.bat
+     + -w default Harbour build switch changed to -w2, 
+       to further maintain code quality.
+     ; Notice that CONTRIB might need some fixing here.
+     + Added proper BC/VC make batch files for "samples".
+
+   * harbour/include/hbclass.ch
+   * harbour/source/debug/dbgmenu.prg
+   * harbour/source/debug/debugger.prg
+   * harbour/source/rtl/teditor.prg
+   * harbour/utils/hbdoc/genchm.prg
+   * harbour/utils/hbdoc/genhtm.prg
+   * harbour/utils/hbdoc/genng.prg
+   * harbour/utils/hbdoc/genos2.prg
+   * harbour/utils/hbdoc/genpdf1.prg
+   * harbour/utils/hbdoc/genrtf.prg
+   * harbour/utils/hbdoc/os2.prg
+   * harbour/utils/hbmake/hbmake.prg
+   * harbour/utils/hbmake/radios.prg
+   * harbour/utils/hbpptest/pretest.prg
+   * harbour/utils/hbtest/rt_misc.prg
+     + Added HB_SYMBOL_UNUSED() inside codeblocks.
+     ! Removed a few uneeded codeblock parameters.
+     + Added HB_SYMBOL_UNUSED() to some class syntax generated 
+       code to avoid unused "Self" var warnings.
+
+   * harbour/ChangeLog.017
+     ! Typos.
+
 2007-03-31 12:40 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
  * harbour/include/Makefile
  + harbour/include/hbchksum.h
--- a/harbour/ChangeLog.017
+++ b/harbour/ChangeLog.017
@@ -3010,13 +3010,13 @@
     ; Notes:
       - From now on, it possible to create/load files using the
         above functions/commands which have no extension. This
-         might be desirable in a few platform and/or situations.
+         might be desirable in a few platforms and/or situations.
         For example on Win32, it's possible to directly print
         to a shared Windows printer queue, using these commands:
             lOldValue := Set( _SET_DEFEXTENSIONS, .F. )
             SET PRINTER TO \\myserver\myprinter
             Set( _SET_DEFEXTENSIONS, lOldValue )
-         Or, it is possible to open a dbf file which has no extension:
+         Or, it is possible to open a dbf file which have no extension:
             dbUseArea(.T., NIL, "dbf_filename_with_no_extension", "w_DATA", .F., .F.)
       - Compiler is (of course) not affected by this setting.
       - Preprocessor (PP) lib flavour is not affected by this setting.
--- a/harbour/config/rules.cf
+++ b/harbour/config/rules.cf
@@ -20,7 +20,7 @@ HB := $(HB_BIN_COMPILE)/
 endif
 HB := $(HB)harbour$(EXE_EXT)

-HB_FLAGS = -n -q0 -w -es2 -gc0 -I$(TOP) -I$(HB_INC_COMPILE)
+HB_FLAGS = -n -q0 -w2 -es2 -gc0 -I$(TOP) -I$(HB_INC_COMPILE)

 # The rule to link an executable.
 ifeq ($(LD_RULE),)
--- a/harbour/contrib/btree/makefile.bc
+++ b/harbour/contrib/btree/makefile.bc
@@ -24,5 +24,5 @@ $(OBJ_DIR)\hb_btree.obj   : hb_btree.c
  tlib $(LIB_DIR)\hb_btree.lib -+$@,,

 .prg.c:
-  $(BIN_DIR)\harbour.exe $< -q0 -w -es2 -gc0 -n -i$(INCLUDE_DIR) -o$@
+  $(BIN_DIR)\harbour.exe $< -q0 -w2 -es2 -gc0 -n -i$(INCLUDE_DIR) -o$@

--- a/harbour/contrib/htmllib/Makefile.bc
+++ b/harbour/contrib/htmllib/Makefile.bc
@@ -70,7 +70,7 @@ TOOLS1_DIR    = examples
 CFLAGS         = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -v $(CLIBFLAGS)
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -w0 -gc0 $(PRG_USR) $(HARBOURFLAGS) -p
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -w2 -gc0 $(PRG_USR) $(HARBOURFLAGS) -p
 LDFLAGS        = $(LDFLAGS)

 #
--- a/harbour/contrib/htmllib/makefile.vc
+++ b/harbour/contrib/htmllib/makefile.vc
@@ -19,7 +19,7 @@ CC = cl
 CFLAGS = -TP -W3 -nologo -I$(INCLUDE_DIR)
 CLIBFLAGS = $(CFLAGS) -c
 CLIBFLAGSDEBUG = $(CLIBFLAGS) -Zi
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -w0 -gc0 $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -w2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)

 #
--- a/harbour/contrib/libct/makefile.bc
+++ b/harbour/contrib/libct/makefile.bc
@@ -70,7 +70,7 @@ TOOLS_DIR    = .
 CFLAGS         = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -v $(CLIBFLAGS)
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)

 #
--- a/harbour/contrib/libct/makefile.vc
+++ b/harbour/contrib/libct/makefile.vc
@@ -69,7 +69,7 @@ AS             = masm
 CFLAGS         = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS)
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)

 #
--- a/harbour/contrib/libgt/makefile.bc
+++ b/harbour/contrib/libgt/makefile.bc
@@ -70,7 +70,7 @@ TOOLS_DIR    = .
 CFLAGS         = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -v $(CLIBFLAGS)
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)

 #
--- a/harbour/contrib/libgt/makefile.vc
+++ b/harbour/contrib/libgt/makefile.vc
@@ -69,7 +69,7 @@ AS             = masm
 CFLAGS         = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS)
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)

 #
--- a/harbour/contrib/libmisc/makefile.bc
+++ b/harbour/contrib/libmisc/makefile.bc
@@ -70,7 +70,7 @@ TOOLS_DIR    = .
 CFLAGS         = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -v $(CLIBFLAGS)
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)

 #
--- a/harbour/contrib/libmisc/makefile.vc
+++ b/harbour/contrib/libmisc/makefile.vc
@@ -69,7 +69,7 @@ AS             = masm
 CFLAGS         = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS)
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)

 #
--- a/harbour/contrib/libnf/makefile.vc
+++ b/harbour/contrib/libnf/makefile.vc
@@ -69,7 +69,7 @@ AS             = masm
 CFLAGS         = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS)
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)

 #
--- a/harbour/contrib/libnf/nanfor.bc
+++ b/harbour/contrib/libnf/nanfor.bc
@@ -76,7 +76,7 @@ HARBOUR_EXE    = ..\..\bin\b32\harbour.exe
 CFLAGS         = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS) -DHB_LANG_DEFAULT=$(HB_LANG_DEFAULT)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -v $(CLIBFLAGS)
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)
 #
 # Macros to access our library names
--- a/harbour/contrib/samples/make_b32.bat
+++ b/harbour/contrib/samples/make_b32.bat
@@ -0,0 +1,28 @@
+@echo off
+rem
+rem $Id$
+rem
+
+if "%1" == "clean" goto CLEAN
+if "%1" == "CLEAN" goto CLEAN
+
+:BUILD
+
+   make -fmakefile.bc %1 %2 %3 > make_b32.log
+   if errorlevel 1 goto BUILD_ERR
+
+:BUILD_OK
+
+   goto EXIT
+
+:BUILD_ERR
+
+   notepad make_b32.log
+   goto EXIT
+
+:CLEAN
+
+   goto EXIT
+
+:EXIT
+
--- a/harbour/contrib/samples/make_vc.bat
+++ b/harbour/contrib/samples/make_vc.bat
@@ -0,0 +1,19 @@
+@echo off
+rem 
+rem $Id$
+rem 
+
+:BUILD
+
+   nmake /f makefile.vc %1 %2 %3 > make_vc.log
+   if errorlevel 1 goto BUILD_ERR
+
+:BUILD_OK
+
+   goto EXIT
+
+:BUILD_ERR
+
+   notepad make_vc.log
+
+:EXIT
--- a/harbour/contrib/samples/makefile.bc
+++ b/harbour/contrib/samples/makefile.bc
@@ -36,7 +36,7 @@ SAMPLES_DIR     = .
 CFLAGS         = -I$(INCLUDE_DIR) -d $(C_USR) $(CFLAGS)
 CLIBFLAGS  =$(CFLAGS)
 HARBOUR_EXE  = $(BIN_DIR)\harbour.exe
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)

 #
--- a/harbour/contrib/samples/makefile.vc
+++ b/harbour/contrib/samples/makefile.vc
@@ -69,7 +69,7 @@ AS             = masm
 CFLAGS         = -I$(INCLUDE_DIR) -TP -W3 -nologo $(C_USR) $(CFLAGS)
 CLIBFLAGS      = -c $(CFLAGS) $(CLIBFLAGS)
 CLIBFLAGSDEBUG = -Zi $(CLIBFLAGS)
-HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
+HARBOURFLAGS   = -i$(INCLUDE_DIR) -n -q0 -w2 -es2 -gc0 $(PRG_USR) $(HARBOURFLAGS)
 LDFLAGS        = $(LDFLAGS)

 #
--- a/harbour/contrib/samples/makevc.bat
+++ b/harbour/contrib/samples/makevc.bat
@@ -1,14 +0,0 @@
-@echo off
-SET _LIB=%LIB%
-SET _PATH=%PATH%
-SET _INCLUDE=%INCLUDE%
-SET LIB=C:\COMPILER\VC\LIB;%PATH%
-SET PATH=C:\COMPILER\VC\BIN;%PATH%
-SET INCLUDE=INCLUDE;C:\COMPILER\VC\INCLUDE;%_INCLUDE%
-nmake /f makefile.vc %1 %2 %3
-SET LIB=%_LIB%
-SET PATH=%_PATH%
-SET INCLUDE=%_INCLUDE%
-SET _LIB=
-SET _PATH=
-SET _INCLUDE=
--- a/harbour/include/hbclass.ch
+++ b/harbour/include/hbclass.ch
@@ -321,7 +321,7 @@ DECLARE HBClass ;

 /* Operator overloading */
 #xcommand OPERATOR <op> [<arg: ARG, ARGS> <Args,...>] [LOCAL <Locals,...>] INLINE <Code,...> [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
-   s_oClass:AddInline( <(op)>, {|Self [,<Args>] [,<Locals>]| <Code>}, __HB_CLS_SCOPE( <.export.>, <.protect.>, <.hidde.> ) )
+   s_oClass:AddInline( <(op)>, {|Self [,<Args>] [,<Locals>]| <Code>}, HB_SYMBOL_UNUSED(Self), __HB_CLS_SCOPE( <.export.>, <.protect.>, <.hidde.> ) )

 #xcommand METHOD <MethodName> [ AS <type> ] OPERATOR <op> [ <export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] => ;
   _HB_MEMBER __HB_CLS_ASFUNC(<MethodName>) [ AS <type> ];;
@@ -360,7 +360,7 @@ DECLARE HBClass ;
   s_oClass:AddInline( __HB_CLS_ASSTRING(<MessageName>), <CodeBlock>, __HB_CLS_SCOPE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ctor.>, HB_OO_CLSTP_CTOR, 0 ) + iif( <.persistent.>, HB_OO_CLSTP_PERSIST, 0 ) )

 #xcommand MESSAGE <MessageName> [ AS <type> ] [LOCAL <Locals,...>] INLINE <Code,...> [<ctor: CONSTRUCTOR>] [<export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [<persistent: PERSISTENT, PROPERTY>] => ;
-   MESSAGE <MessageName> [ AS <type> ] BLOCK {|Self __HB_CLS_ASARGSOPT(<MessageName>) [,<Locals>]| <Code>} <ctor> <export> <protect> <hidde> <persistent>
+   MESSAGE <MessageName> [ AS <type> ] BLOCK {|Self __HB_CLS_ASARGSOPT(<MessageName>) [,<Locals>]| HB_SYMBOL_UNUSED(Self), <Code>} <ctor> <export> <protect> <hidde> <persistent>

 #xcommand MESSAGE <MessageName> [ AS <type> ] <arg: ARG, ARGS> <Args,...> [LOCAL <Locals,...>] INLINE <Code,...> [<ctor: CONSTRUCTOR>] [<export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [<persistent: PERSISTENT, PROPERTY>] => ;
   MESSAGE __HB_CLS_ASID(<MessageName>)([<Args>]) [ AS <type> ] [LOCAL <Locals>] INLINE <Code> <ctor> <export> <protect> <hidde> <persistent>
@@ -439,10 +439,10 @@ DECLARE HBClass ;

   // Classy compatibility... Added By JF Lefebvre (mafact) 2006/11/07
   #xcommand METHOD <MethodName> [ AS <type> ] INLINE [Local <v>,] <Code,...> [<other>] => ;
-             MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<v>] | <Code> } [<other>]
+             MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<v>] | HB_SYMBOL_UNUSED(Self), <Code> } [<other>]

   #xcommand METHOD <MethodName>( [<params,...>] ) [ AS <type> ] INLINE [Local <v>,] <Code,...> [<other>] => ;
-             MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<params>] [,<v>] | <Code> } [<other>]
+             MESSAGE <MethodName> [ AS <type> ] BLOCK {|Self [,<params>] [,<v>] | HB_SYMBOL_UNUSED(Self), <Code> } [<other>]


   /* This definitions are not Class(y) compatible - I'm leaving them as is now */
--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -115,7 +115,7 @@ CLIBFLAGSDLL   = -D__EXPORT__ -tWM $(BCCDLL_WITH_DYNRT) $(CLIBFLAGS) $(CLIBFLAGS
 CEXEFLAGSDLL   = -tWM $(BCCDLL_WITH_DYNRT) $(CLIBFLAGS) $(CEXEFLAGSDLL)

 # Harbour Compiler Flags
-HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w -es2 -gc0 $(PRG_USR)
+HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc0 $(PRG_USR)
 !ifdef HB_DOC_PDF
   HBFLAGSCMN  = $(HBFLAGSCMN) -dPDF
 !endif
--- a/harbour/makefile.vc
+++ b/harbour/makefile.vc
@@ -127,7 +127,7 @@ CLIBFLAGSDLL   = -D__EXPORT__ -MT$(DBGMARKER) $(CLIBFLAGS) $(CLIBFLAGSDLL)
 CEXEFLAGSDLL   = -MT$(DBGMARKER) $(CLIBFLAGS) $(CEXEFLAGSDLL)

 # Harbour Compiler Flags
-HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w -es2 -gc1 $(PRG_USR)
+HBFLAGSCMN     = -i$(INCLUDE_DIR) -q0 -w2 -es2 -gc1 $(PRG_USR)
 !ifdef HB_DOC_PDF
 HBFLAGSCMN  = $(HBFLAGSCMN) -dPDF
 !endif
--- a/harbour/source/debug/dbgmenu.prg
+++ b/harbour/source/debug/dbgmenu.prg
@@ -57,7 +57,7 @@
          [ IDENT <nIdent> ] [ ACTION <uAction,...> ] ;
          [ CHECKED <bChecked> ] => ;
   [ <oMenuItem> := ] TDbMenu():AddItem( TDbMenuItem():New( <cPrompt>,;
-   [{|Self|<uAction>}], [<bChecked>], [<nIdent>] ) )
+   [{|Self| HB_SYMBOL_UNUSED(Self), <uAction>}], [<bChecked>], [<nIdent>] ) )
 #xcommand SEPARATOR => TDbMenu():AddItem( TDbMenuItem():New( "-" ) )
 #xcommand ENDMENU => ATail( TDbMenu():aMenus ):Build()

--- a/harbour/source/debug/debugger.prg
+++ b/harbour/source/debug/debugger.prg
@@ -1527,7 +1527,7 @@ METHOD ShowCallStack() CLASS TDebugger
      ::oWndStack := TDbWindow():New( 1, MaxCol() - 15, MaxRow() - 6, MaxCol(),;
                                     "Calls" )
      ::oWndStack:bKeyPressed  := { | nKey | ::CallStackProcessKey( nKey ) }
-      ::oWndStack:bLButtonDown := { | nKey | ::CallStackProcessKey( K_LBUTTONDOWN ) }
+      ::oWndStack:bLButtonDown := { | nKey | HB_SYMBOL_UNUSED( nKey ), ::CallStackProcessKey( K_LBUTTONDOWN ) }

      AAdd( ::aWindows, ::oWndStack )
 //      ::nCurrentWindow = Len( ::aWindows )
@@ -1699,7 +1699,7 @@ METHOD ShowVars() CLASS TDebugger
         iif( ::lShowPublics, " Public", "" ) )

      ::oWndVars:bLButtonDown := { | nMRow, nMCol | ::WndVarsLButtonDown( nMRow, nMCol ) }
-      ::oWndVars:bLDblClick   := { | nMRow, nMCol | ::EditVar( ::oBrwVars:Cargo[ 1 ] ) }
+      ::oWndVars:bLDblClick   := { | nMRow, nMCol | HB_SYMBOL_UNUSED( nMRow ), HB_SYMBOL_UNUSED( nMCol ), ::EditVar( ::oBrwVars:Cargo[ 1 ] ) }

      ::oBrwVars := TDbgBrowser():New( nTop+1, 1, ::oWndVars:nBottom - 1, MaxCol() - iif( ::oWndStack != nil,;
                               ::oWndStack:nWidth(), 0 ) - 1 )
--- a/harbour/source/rtl/teditor.prg
+++ b/harbour/source/rtl/teditor.prg
@@ -115,7 +115,7 @@ CLASS HBEditor
   METHOD RefreshWindow()                                // Redraw a window
   METHOD RefreshLine()                                  // Redraw a line
   METHOD RefreshColumn()                                // Redraw a column of text
-   METHOD LineColor(nRow) INLINE ::cColorSpec            // Returns color string to use to draw nRow (current line if nRow is empty)
+   METHOD LineColor(nRow) INLINE HB_SYMBOL_UNUSED(nRow), ::cColorSpec // Returns color string to use to draw nRow (current line if nRow is empty)

   METHOD MoveCursor(nKey)                               // Move cursor inside text / window (needs a movement key)
   METHOD InsertState(lInsState)                         // Changes lInsert value and insertion / overstrike mode of editor
--- a/harbour/utils/hbdoc/genchm.prg
+++ b/harbour/utils/hbdoc/genchm.prg
@@ -1069,7 +1069,7 @@ FUNC checkChmcolor( cbuffer, ncolorpos )
      cOldColorString := SUBSTR( cbuffer, ncolorpos )
      nColorend       := AT( ">", cOldColorString )
      cOldColorString := SUBSTR( cOldColorString, 1, nColorEnd )
-      nreturn         := ASCAN( acolortable, { | x, y | UPPER( x ) == UPPER( ccolor ) } )
+      nreturn         := ASCAN( acolortable, { | x | UPPER( x ) == UPPER( ccolor ) } )
      IF nreturn > 0
         creturn := '<font color=' + acolortable[ nreturn ] + '>'
      ENDIF
@@ -1299,7 +1299,7 @@ FUNCTION ProcChmTable( cBuffer, nNum )
      cBuffer   := STRTRAN( cbuffer, "<color:", "" )
      cBuffer   := STRTRAN( cbuffer, ">", "" )
      cBuffer   := STRTRAN( cBuffer, ccolor, '' )
-      nColorpos := ASCAN( aColorTable, { | x, y | UPPER( x ) == UPPER( ccolor ) } )
+      nColorpos := ASCAN( aColorTable, { | x | UPPER( x ) == UPPER( ccolor ) } )
      cColor    := aColortable[ nColorPos ]
   ENDIF
   IF EMPTY( cBuffer )
@@ -1427,7 +1427,7 @@ STATIC FUNCTION GetItem( cItem, nCurdoc )
   LOCAL lReturn
   LOCAL xPos
   xPos := aCurdoc[ nCurdoc ]
-   nPos := ASCAN( xPos, { | x, y | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )
+   nPos := ASCAN( xPos, { | x | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )
   IF nPos > 0
      cCuritem := xPos[ nPos ]
      IF AT( "$", xPos[ nPos + 1 ] ) > 0
--- a/harbour/utils/hbdoc/genhtm.prg
+++ b/harbour/utils/hbdoc/genhtm.prg
@@ -1077,7 +1077,7 @@ FUNC checkhtmcolor( cbuffer, ncolorpos )
      cOldColorString := SUBSTR( cbuffer, ncolorpos )
      nColorend       := AT( ">", cOldColorString )
      cOldColorString := SUBSTR( cOldColorString, 1, nColorEnd )
-      nreturn         := ASCAN( acolortable, { | x, y | UPPER( x ) == UPPER( ccolor ) } )
+      nreturn         := ASCAN( acolortable, { | x | UPPER( x ) == UPPER( ccolor ) } )
      IF nreturn > 0
         creturn := '<font color=' + acolortable[ nreturn ] + '>'
      ENDIF
@@ -1310,7 +1310,7 @@ FUNCTION ProchtmTable( cBuffer, nNum )
      cBuffer   := STRTRAN( cbuffer, "<color:", "" )
      cBuffer   := STRTRAN( cbuffer, ">", "" )
      cBuffer   := STRTRAN( cBuffer, ccolor, '' )
-      nColorpos := ASCAN( aColorTable, { | x, y | UPPER( x ) == UPPER( ccolor ) } )
+      nColorpos := ASCAN( aColorTable, { | x | UPPER( x ) == UPPER( ccolor ) } )
      cColor    := aColortable[ nColorPos ]
   ENDIF
   IF EMPTY( cBuffer )
@@ -1441,7 +1441,7 @@ STATIC FUNCTION GetItem( cItem, nCurdoc )
   if nCurdoc <= len(aCurdoc)
     xPos := aCurdoc[ nCurdoc ]
   endif  
-   nPos := ASCAN( xPos, { | x, y | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )
+   nPos := ASCAN( xPos, { | x | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )
   IF nPos > 0
      cCuritem := xPos[ nPos ]
      IF AT( "$", xPos[ nPos + 1 ] ) > 0
--- a/harbour/utils/hbdoc/genng.prg
+++ b/harbour/utils/hbdoc/genng.prg
@@ -1163,7 +1163,7 @@ FUNCTION ProcNgTable( cBuffer, nNum )
      cBuffer   := STRTRAN( cbuffer, "<color:", "" )
      cBuffer   := STRTRAN( cbuffer, ">", "" )
      cBuffer   := STRTRAN( cBuffer, ccolor, '' )
-      nColorpos := ASCAN( aColorTable, { | x, y | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
+      nColorpos := ASCAN( aColorTable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
      cColor    := aColortable[ nColorPos, 2 ]
   ENDIF
   /*
@@ -1576,7 +1576,7 @@ FUNC checkngcolor( cbuffer, ncolorpos )
      cOldColorString := SUBSTR( cbuffer, ncolorpos )
      nColorend       := AT( ">", cOldColorString )
      cOldColorString := SUBSTR( cOldColorString, 1, nColorEnd )
-      nreturn         := ASCAN( acolortable, { | x, y | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
+      nreturn         := ASCAN( acolortable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
      IF nreturn > 0
         cReturn := "^a" + acolortable[ nreturn, 2 ]
      ENDIF
@@ -1761,7 +1761,7 @@ STATIC FUNCTION GetItem( cItem, nCurdoc )
   LOCAL lReturn
   LOCAL xPos
   xPos := aCurdoc[ nCurdoc ]
-   nPos := ASCAN( xPos, { | x, y | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )
+   nPos := ASCAN( xPos, { | x | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )
   IF nPos > 0
      cCuritem := xPos[ nPos ]
      IF AT( "$", xPos[ nPos + 1 ] ) > 0
--- a/harbour/utils/hbdoc/genos2.prg
+++ b/harbour/utils/hbdoc/genos2.prg
@@ -850,7 +850,7 @@ FUNC checkos2color( cbuffer, ncolorpos )
      cOldColorString := SUBSTR( cbuffer, ncolorpos )
      nColorend       := AT( ">", cOldColorString )
      cOldColorString := SUBSTR( cOldColorString, 1, nColorEnd )
-      nreturn         := ASCAN( acolortable, { | x, y | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
+      nreturn         := ASCAN( acolortable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
      IF nreturn > 0
         creturn := + acolortable[ nreturn, 2 ]
      ENDIF
@@ -885,7 +885,7 @@ FUNCTION ProcOs2Table( cBuffer , nNum )
      cBuffer   := STRTRAN( cbuffer, "<color:", "" )
      cBuffer   := STRTRAN( cbuffer, ">", "" )
      cBuffer   := STRTRAN( cBuffer, ccolor, '' )
-      nColorpos := ASCAN( aColorTable, { | x, y | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
+      nColorpos := ASCAN( aColorTable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
      cColor    := aColortable[ nColorPos, 2 ]
   ENDIF
   IF EMPTY( cBuffer )
@@ -1305,7 +1305,7 @@ STATIC FUNCTION GetItem( cItem, nCurdoc )
   LOCAL lReturn
   LOCAL xPos
   xPos := aCurdoc[ nCurdoc ]
-   nPos := ASCAN( xPos, { | x, y | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )
+   nPos := ASCAN( xPos, { | x | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )
   IF nPos > 0
      cCuritem := xPos[ nPos ]
      IF AT( "$", xPos[ nPos + 1 ] ) > 0
--- a/harbour/utils/hbdoc/genpdf1.prg
+++ b/harbour/utils/hbdoc/genpdf1.prg
@@ -832,7 +832,7 @@ FUNCTION ProcPdfTable( cBuffer, nNum )
      cBuffer   := STRTRAN( cbuffer, "<color:", "" )
      cBuffer   := STRTRAN( cbuffer, ">", "" )
      cBuffer   := STRTRAN( cBuffer, ccolor, '' )
-      nColorpos := ASCAN( aColorTable, { | x, y | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
+      nColorpos := ASCAN( aColorTable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
      cColor    := aColortable[ nColorPos, 2 ]
   ENDIF
   IF !EMPTY( cBuffer )
@@ -1208,7 +1208,7 @@ FUNC CheckPdfColor( cbuffer, ncolorpos )
      cOldColorString := SUBSTR( cbuffer, ncolorpos )
      nColorend       := AT( ">", cOldColorString )
      cOldColorString := SUBSTR( cOldColorString, 1, nColorEnd )
-      nreturn         := ASCAN( acolortable, { | x, y | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
+      nreturn         := ASCAN( acolortable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
      IF nreturn > 0
         cReturn := "^a" + acolortable[ nreturn, 2 ]
      ENDIF
@@ -1394,7 +1394,7 @@ STATIC FUNCTION GetItem( cItem, nCurdoc )
   LOCAL x
   LOCAL xPos
   xPos := aCurdoc[ nCurdoc ]
-   nPos := ASCAN( xPos, { | x, y | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )
+   nPos := ASCAN( xPos, { | x | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )
   IF nPos > 0
      cCuritem := xPos[ nPos ]
      IF AT( "$", xPos[ nPos + 1 ] ) > 0
--- a/harbour/utils/hbdoc/genrtf.prg
+++ b/harbour/utils/hbdoc/genrtf.prg
@@ -1023,7 +1023,7 @@ FUNCTION ProcRtfTable( cBuffer )
      cBuffer   := STRTRAN( cbuffer, "<color:", "" )
      cBuffer   := STRTRAN( cbuffer, ">", "" )
      cBuffer   := STRTRAN( cBuffer, ccolor, '' )
-      nColorpos := ASCAN( aColorTable, { | x, y | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
+      nColorpos := ASCAN( aColorTable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
      cColor    := aColortable[ nColorPos, 2 ]
   ENDIF
   IF !EMPTY( cBuffer )
@@ -1106,7 +1106,7 @@ FUNC checkrtfcolor( cbuffer, ncolorpos )
      cOldColorString := SUBSTR( cbuffer, ncolorpos )
      nColorend       := AT( ">", cOldColorString )
      cOldColorString := SUBSTR( cOldColorString, 1, nColorEnd )
-      nreturn         := ASCAN( acolortable, { | x, y | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
+      nreturn         := ASCAN( acolortable, { | x | UPPER( x[ 1 ] ) == UPPER( ccolor ) } )
      IF nreturn > 0
         creturn := "\cf" + acolortable[ nreturn, 2 ]
      ENDIF
@@ -1294,7 +1294,7 @@ STATIC FUNCTION GetItem( cItem, nCurdoc )
   LOCAL lReturn
   LOCAL xPos
   xPos := aCurdoc[ nCurdoc ]
-   nPos := ASCAN( xPos, { | x, y | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )
+   nPos := ASCAN( xPos, { | x | UPPER( ALLTRIM( x ) ) == UPPER( ALLTRIM( cItem ) ) } )
   IF nPos > 0
      cCuritem := xPos[ nPos ]
      IF AT( "$", xPos[ nPos + 1 ] ) > 0
--- a/harbour/utils/hbdoc/os2.prg
+++ b/harbour/utils/hbdoc/os2.prg
@@ -280,7 +280,7 @@ METHOD WriteLink( cLink ) CLASS TOs2
   IF Self:Scanlink( cLink ) == 0
      nItem := ASCAN( Self:aLinkRef, { | a | upper(a[ 1 ]) == upper(cLink) } )                // Again.
   ELSE
-      nItem := ASCAN( Self:aLinkRef, { | a, b | upper(a[ 1 ]) == upper(cLink) } )
+      nItem := ASCAN( Self:aLinkRef, { | a | upper(a[ 1 ]) == upper(cLink) } )

   ENDIF

@@ -298,7 +298,7 @@ METHOD ScanLink( cLink ) CLASS TOs2

   LOCAL nItem

-   nItem := ASCAN( Self:aLinkRef, { | a, b | Upper(a[ 1 ] )== upper(cLink) } )
+   nItem := ASCAN( Self:aLinkRef, { | a | Upper(a[ 1 ] )== upper(cLink) } )

   IF nItem == 0
      AADD( Self:aLinkRef, { upper(cLink), Self:nRef } )
--- a/harbour/utils/hbmake/hbmake.prg
+++ b/harbour/utils/hbmake/hbmake.prg
@@ -1467,7 +1467,7 @@ FUNC crtmakfile( cFile )
    aOut := Aclone( aIn )
    pickarry( 11, 15, 20, 64, aIn, aOut )
    nLenaOut := Len( aOut )
-    Aeval( aout, { | x, y | aout[ y ] := Trim( Substr( aOut[ y ], 1, At( ' ', aout[ y ] ) ) ) } )
+    Aeval( aout, { | x, y | HB_SYMBOL_UNUSED( x ), aout[ y ] := Trim( Substr( aOut[ y ], 1, At( ' ', aout[ y ] ) ) ) } )
    aOut := Asort( aOut )

    IF Len( aOut ) == 1
@@ -1536,7 +1536,7 @@ FUNC crtmakfile( cFile )

    IF !lextended

-        Aeval( aOutc, { | xItem, x | hb_FNAMESPLIT( xiTem, @cPath, @cTest, @cExt, @cDrive ), cext := Substr( cExt, 2 ), If( !lGcc, Aadd( aObjs, cObjDir + cTest + "." + exten( cExt, 2 ) ), Aadd( aObjs, cObjDir + cTest + "." + exten( cExt, 1 ) ) ) } )
+        Aeval( aOutc, { | xItem | hb_FNAMESPLIT( xiTem, @cPath, @cTest, @cExt, @cDrive ), cext := Substr( cExt, 2 ), If( !lGcc, Aadd( aObjs, cObjDir + cTest + "." + exten( cExt, 2 ) ), Aadd( aObjs, cObjDir + cTest + "." + exten( cExt, 1 ) ) ) } )
        Aeval( aout, { | xItem | hb_FNAMESPLIT( xiTem, @cPath, @cTest, @cExt, @cDrive ), cExt := Substr( cExt, 2 ), Aadd( aCs, cObjDir + cTest + "." + exte( cExt, 1 ) ) } )

    ELSE
@@ -2539,7 +2539,7 @@ FUNC crtlibmakfile( cFile )
    pickarry( 10, 15, 19, 64, aIn, aOut )
    nLenaOut := Len( aOut )

-    Aeval( aout, { | x, y | aout[ y ] := Trim( Substr( aOut[ y ], 1, At( ' ', aout[ y ] ) ) ) } )
+    Aeval( aout, { | x, y | HB_SYMBOL_UNUSED( x ), aout[ y ] := Trim( Substr( aOut[ y ], 1, At( ' ', aout[ y ] ) ) ) } )
    Aeval( aout, { | xItem | If( At( '.c', xItem ) > 0 .or. At( '.C', xItem ) > 0, Aadd( aoutc, xitem ), ) } )
    Aeval( aoutc, { | x, z | citem := x, z := Ascan( aout, { | t | t = citem } ), If( z > 0, Asize( Adel( aout, z ), Len( aout ) - 1 ), ) } )

@@ -2552,7 +2552,7 @@ FUNC crtlibmakfile( cFile )

    IF !lextended

-        Aeval( aOutc, { | xItem, x | hb_FNAMESPLIT( xiTem, @cPath, @cTest, @cExt, @cDrive ), cext := Substr( cExt, 2 ), If( !lGcc, Aadd( aObjs, cObjDir + cTest + "." + exten( cExt, 2 ) ), Aadd( aObjs, cObjDir + cTest + "." + exten( cExt, 1 ) ) ) } )
+        Aeval( aOutc, { | xItem | hb_FNAMESPLIT( xiTem, @cPath, @cTest, @cExt, @cDrive ), cext := Substr( cExt, 2 ), If( !lGcc, Aadd( aObjs, cObjDir + cTest + "." + exten( cExt, 2 ) ), Aadd( aObjs, cObjDir + cTest + "." + exten( cExt, 1 ) ) ) } )
        Aeval( aout, { | xItem | hb_FNAMESPLIT( xiTem, @cPath, @cTest, @cExt, @cDrive ), cExt := Substr( cExt, 2 ), Aadd( aCs, cObjDir + cTest + "." + exte( cExt, 1 ) ) } )

    ELSE
--- a/harbour/utils/hbmake/radios.prg
+++ b/harbour/utils/hbmake/radios.prg
@@ -64,7 +64,8 @@ LOCAL nRow := Row(), nCol := Col()
 LOCAL nGets := Len(aChoices)
 LOCAL nGet
 LOCAL nStartGet := Len(aGetList) + 1
-   default bvalid to {||.t.}
+
+  default bvalid to {||.t.}

  // For each element in aChoices
  FOR nGet := 1 To nGets
@@ -77,12 +78,12 @@ LOCAL nStartGet := Len(aGetList) + 1
    oGet := GetNew(nRow++,ncol+4,t(aChoices[nGet]),cvar)
    Aadd(aGetList, oGet)

-    oGet:cargo := Array(RADIO_NUM_IVARS)
-   oGet:PostBlock:=bValid
+    oGet:cargo     := Array(RADIO_NUM_IVARS)
+    oGet:PostBlock := bValid
    oGet:radioGsb  := bVar
    oGet:radioGets := Array(nGets)

-    Aeval(oGet:radioGets, {|x, n| oGet:radioGets[n] := nStartGet + n - 1})
+    Aeval(oGet:radioGets, {|x, n| HB_SYMBOL_UNUSED( x ), oGet:radioGets[n] := nStartGet + n - 1})

    // Radio gets have their own reader, of course
    oGet:reader := {|o| RadioReader(o, aGetList) }
@@ -95,7 +96,7 @@ RETURN oGet

 FUNCTION t(c)

-RETURN {|x| c }
+RETURN {|| c }


 // The reader for radio buttons
--- a/harbour/utils/hbpptest/pretest.prg
+++ b/harbour/utils/hbpptest/pretest.prg
@@ -2,6 +2,8 @@
 * $Id$
 */

+#include "common.ch"
+
 #ifndef __HARBOUR__
   #xtranslate HB_OSNewLine() => ( Chr( 13 ) + Chr( 10 ) )
 #endif
@@ -14,7 +16,7 @@
 /* Testing preprocessor */

 PROCEDURE MAIN()
-LOCAL in, out, pre
+LOCAL in, pre
 LOCAL nCnt:=0
 LOCAL nRes:=0

@@ -1204,7 +1206,7 @@ ENDTEXT
  RETURN

 PROCEDURE PrePrepare( in )
-LOCAL len, i, cin, cout
+LOCAL len, i, cin

  len := MLCOUNT( in )
  FOR i:=1 TO len
@@ -1215,9 +1217,13 @@ LOCAL len, i, cin, cout
 RETURN

 FUNCTION PreRun( in, pre )
-LOCAL len, i, cin, cout
+LOCAL len, i, cin
 LOCAL out:=''

+#ifdef __HARBOUR__
+  HB_SYMBOL_UNUSED( pre )
+#endif
+
  len := MLCOUNT( in, 1024 )
  FOR i:=1 TO len
    cin := ALLTRIM( MEMOLINE(in, 1024, i) )
--- a/harbour/utils/hbtest/rt_misc.prg
+++ b/harbour/utils/hbtest/rt_misc.prg
@@ -50,6 +50,8 @@
 *
 */

+#include "common.ch"
+
 #include "rt_main.ch"

 /* Don't change the position of this #include. */
@@ -240,7 +242,11 @@ FUNCTION Main_MISC()
   TEST_LINE( Eval( @sbBlock )                , "E BASE 1004 No exported method EVAL A:1:B:{||...} F:S" ) /* CA-Cl*pper returns "E BASE 1004 No exported method EVAL A:1:U:{||...} F:S" */
   TEST_LINE( Eval( {|p1| p1 },"A","B")       , "A"                                       )
   TEST_LINE( Eval( {|p1,p2| p1+p2 },"A","B") , "AB"                                      )
+#ifdef __HARBOUR__
+   TEST_LINE( Eval( {|p1,p2,p3| HB_SYMBOL_UNUSED(p2), HB_SYMBOL_UNUSED(p3), p1 },"A","B") , "A"                                       )
+#else
   TEST_LINE( Eval( {|p1,p2,p3| p1 },"A","B") , "A"                                       )
+#endif
   TEST_LINE( suNIL:Eval()                    , "E BASE 1004 No exported method EVAL A:1:U:NIL F:S" )
   TEST_LINE( scString:Eval()                 , "E BASE 1004 No exported method EVAL A:1:C:HELLO F:S"    )
   TEST_LINE( snIntP:Eval()                   , "E BASE 1004 No exported method EVAL A:1:N:10 F:S"       )
@@ -778,7 +784,7 @@ STATIC FUNCTION HB_TString()
      oClass:AddInline( ".AND.", {| self, cTest | ::cValue + " AND " + cTest } )
      oClass:AddInline( ".OR." , {| self, cTest | ::cValue + " OR " + cTest } )

-      oClass:AddInline( "HasMsg", {| self, cMsg | __ObjHasMsg( QSelf(), cMsg ) } )
+      oClass:AddInline( "HasMsg", {| self, cMsg | HB_SYMBOL_UNUSED( self ), __ObjHasMsg( QSelf(), cMsg ) } )

      oClass:Create()
   ENDIF