2006-02-07 12:20 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu)

* makefile.bc + Updated for latest changes. * bin/bld.bat + Added codepage lib. * source/codepage/cdpbg866.c * source/codepage/cdpbgiso.c * source/codepage/cdpbgwin.c + Added two missing chars to BG alphabet. * source/vm/arrays.c * source/vm/mainwin.c * source/rtl/hbgtcore.c * include/hbapigt.h * source/rtl/gtpca/gtpca.c * source/rtl/gtstd/gtstd.c ! Fixed recent compiler warnings.
2006-02-07 11:33:06 +00:00
parent 9efffadd02
commit eb090812f3
13 changed files with 88 additions and 54 deletions
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,26 @@
   2002-12-01 13:30 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
      * fixed <-x-> match marker
+2006-02-07 12:20 UTC+0100 Viktor Szakats (viktor.szakats syenar.hu)
+   * makefile.bc
+     + Updated for latest changes.
+
+   * bin/bld.bat
+     + Added codepage lib.
+
+   * source/codepage/cdpbg866.c
+   * source/codepage/cdpbgiso.c
+   * source/codepage/cdpbgwin.c
+     + Added two missing chars to BG alphabet.
+
+   * source/vm/arrays.c
+   * source/vm/mainwin.c
+   * source/rtl/hbgtcore.c
+   * include/hbapigt.h
+   * source/rtl/gtpca/gtpca.c
+   * source/rtl/gtstd/gtstd.c
+     ! Fixed recent compiler warnings.
+
 2006-02-05 09:47 UTC+0200 Chen Kedem <niki@actcom.co.il>
   * source/rtl/gtos2/gtos2.c
     * Restore my copyright notice for functions used to be in mouseos2.c
--- a/harbour/bin/bld.bat
+++ b/harbour/bin/bld.bat
@@ -125,6 +125,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include\
      echo -O2 -d -mh %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% > build.tmp
      echo -e%1.exe >> build.tmp
      echo %1.c >> build.tmp
+      echo codepage.lib >> build.tmp
      echo debug.lib >> build.tmp
      echo vm.lib >> build.tmp
      echo rtl.lib >> build.tmp
@@ -148,6 +149,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include\

      echo %1.c > build.tmp
      echo -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% >> build.tmp
+      echo -lcodepage >> build.tmp
      echo -ldebug >> build.tmp
      echo -lvm >> build.tmp
      echo -lrtl >> build.tmp
@@ -172,7 +174,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include\

   if not "%HB_COMPILER%" == "rsx32" GOTO A_DOS_RSX32_NOT

-      gcc %1.c -Zrsx32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon
+      gcc %1.c -Zrsx32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon
      goto END

 :A_DOS_RSX32_NOT
@@ -182,6 +184,7 @@ if "%HB_INC_INSTALL%" == "" set HB_INC_INSTALL=..\include\
      wpp386 -j -w3 -d2 -5s -5r -fp5 -oxehtz -zq -zt0 -bt=DOS %1.c -fo=%1.obj
      echo debug all OP osn=DOS OP stack=65536 OP CASEEXACT OP stub=cwstub.exe NAME %1.exe > build.tmp
      echo FILE %1.obj >> build.tmp
+      echo LIB codepage.lib >> build.tmp
      echo LIB debug.lib >> build.tmp
      echo LIB vm.lib >> build.tmp
      echo LIB rtl.lib >> build.tmp
@@ -205,13 +208,13 @@ if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2

   if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtwin

-   if "%HB_COMPILER%" == "bcc32"   bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbffpt.lib dbfntx.lib dbfcdx.lib hbsix.lib common.lib
+   if "%HB_COMPILER%" == "bcc32"   bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c codepage.lib debug.lib vm.lib rtl.lib %_HB_GT_LIB%.lib lang.lib rdd.lib macro.lib pp.lib dbffpt.lib dbfntx.lib dbfcdx.lib hbsix.lib common.lib

-   if "%HB_COMPILER%" == "gcc"     gcc %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon
-   if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% %HB_INC_TEMP% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp  -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon
-   if "%HB_COMPILER%" == "rsxnt"   gcc %1.c -Zwin32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c -o%1.exe %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon
+   if "%HB_COMPILER%" == "mingw32" gcc %1.c -o%1.exe %CFLAGS% -mno-cygwin -I%HB_INC_INSTALL% %HB_INC_TEMP% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp  -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon
+   if "%HB_COMPILER%" == "rsxnt"   gcc %1.c -Zwin32 %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon

-   if "%HB_COMPILER%" == "msvc"    cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\dbffpt.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\common.lib user32.lib winspool.lib
+   if "%HB_COMPILER%" == "msvc"    cl -TP -W3 %CFLAGS% -I%HB_INC_INSTALL% %1.c /link /subsystem:CONSOLE %HB_LIB_INSTALL%\codepage.lib %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\dbffpt.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\common.lib user32.lib winspool.lib
   if "%HB_COMPILER%" == "msvc"    echo Ignore LNK4033 warning

 :C_WATCOM
@@ -221,6 +224,7 @@ if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2
   wpp386 -j -w3 -d2 -5s -5r -fp5 -oxehtz -zq -zt0 -mf -bt=NT %1.c -fo=%1.obj
   echo debug all OP osn=NT OP stack=65536 OP CASEEXACT NAME %1.exe > build.tmp
   echo FILE %1.obj >> build.tmp
+   echo LIB codepage.lib >> build.tmp
   echo LIB debug.lib >> build.tmp
   echo LIB vm.lib >> build.tmp
   echo LIB rtl.lib >> build.tmp
@@ -249,8 +253,8 @@ if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2

   if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtos2

-   if "%HB_COMPILER%" == "gcc"     gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp  -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon
-   if "%HB_COMPILER%" == "icc"     icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbffpt.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\common.lib
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp  -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon
+   if "%HB_COMPILER%" == "icc"     icc /Gs+ /W2 /Se /Sd+ /Ti+ /C- /Tp %CFLAGS% -I%HB_INC_INSTALL% %1.c %HB_LIB_INSTALL%\codepage.lib %HB_LIB_INSTALL%\debug.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\%_HB_GT_LIB%.lib %HB_LIB_INSTALL%\lang.lib %HB_LIB_INSTALL%\rdd.lib %HB_LIB_INSTALL%\rtl.lib %HB_LIB_INSTALL%\vm.lib %HB_LIB_INSTALL%\macro.lib %HB_LIB_INSTALL%\pp.lib %HB_LIB_INSTALL%\dbffpt.lib %HB_LIB_INSTALL%\dbfntx.lib %HB_LIB_INSTALL%\dbfcdx.lib %HB_LIB_INSTALL%\hbsix.lib %HB_LIB_INSTALL%\common.lib
   goto END

 :A_LINUX
@@ -259,7 +263,7 @@ if not "%HB_ARCHITECTURE%" == "w32" goto A_OS2

   if "%HB_GT_LIB%" == "" set _HB_GT_LIB=gtstd

-   if "%HB_COMPILER%" == "gcc"     gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L../lib -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon
+   if "%HB_COMPILER%" == "gcc"     gcc %1.c %CFLAGS% -I%HB_INC_INSTALL% -L../lib -lcodepage -ldebug -lvm -lrtl -l%_HB_GT_LIB% -llang -lrdd -lrtl -lvm -lmacro -lpp -ldbffpt -ldbfntx -ldbfcdx -lhbsix -lcommon
   goto END

 :CLEANUP
--- a/harbour/contrib/libct/makefile.bc
+++ b/harbour/contrib/libct/makefile.bc
@@ -116,6 +116,8 @@ TOOLS_LIB_OBJS = \
   $(OBJ_DIR)\ctstr.obj \
   $(OBJ_DIR)\ctchksum.obj \
   $(OBJ_DIR)\ctcrypt.obj \
+   $(OBJ_DIR)\ctwfunc.obj \
+   $(OBJ_DIR)\ctwin.obj \
   $(OBJ_DIR)\exponent.obj \
   $(OBJ_DIR)\files.obj \
   $(OBJ_DIR)\finan.obj \
@@ -276,6 +278,14 @@ $(OBJ_DIR)\ctcrypt.obj : $(TOOLS_DIR)\ctcrypt.c
   $(CC) $(CLIBFLAGS) -o$@ $**
   tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,

+$(OBJ_DIR)\ctwfunc.obj : $(TOOLS_DIR)\ctwfunc.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
+
+$(OBJ_DIR)\ctwin.obj : $(TOOLS_DIR)\ctwin.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\exponent.obj : $(TOOLS_DIR)\exponent.c
   $(CC) $(CLIBFLAGS) -o$@ $**
   tlib $(TOOLS_LIB) $(ARFLAGS) -+$@,,
--- a/harbour/include/hbapigt.h
+++ b/harbour/include/hbapigt.h
@@ -253,7 +253,7 @@ extern HB_EXPORT void    hb_inkeyPut( int ch );          /* Inserts an inkey cod
 extern HB_EXPORT int     hb_inkeyLast( int iEvenMask );  /* Return the value of the last key that was extracted */
 extern HB_EXPORT int     hb_inkeyNext( int iEvenMask );  /* Return the next key without extracting it */
 extern HB_EXPORT void    hb_inkeyPoll( void );           /* Poll the console keyboard to stuff the Harbour buffer */
-extern HB_EXPORT void    hb_inkeyReset();                /* Reset the Harbour keyboard buffer */
+extern HB_EXPORT void    hb_inkeyReset( void );          /* Reset the Harbour keyboard buffer */
 extern HB_EXPORT int     hb_inkeyTranslate( int key, int iEvenMask ); /* Translation extended codes to normal codes, if needed */
 extern HB_EXPORT void    hb_inkeySetCancelKeys( int CancelKey, int CancelKeyEx ); /* Set keycodes for Cancel key (usually K_ALT_C) */

--- a/harbour/makefile.bc
+++ b/harbour/makefile.bc
@@ -257,9 +257,12 @@ RTL_LIB_OBJS = \
   $(OBJ_DIR)\gt.obj \
   $(OBJ_DIR)\gtapi.obj \
   $(OBJ_DIR)\gtapiu.obj \
+   $(OBJ_DIR)\gtfunc.obj \
+   $(OBJ_DIR)\gtsys.obj \
   $(OBJ_DIR)\gx.obj \
   $(OBJ_DIR)\hardcr.obj \
   $(OBJ_DIR)\hbffind.obj \
+   $(OBJ_DIR)\hbgtcore.obj \
   $(OBJ_DIR)\hbrandom.obj \
   $(OBJ_DIR)\idle.obj \
   $(OBJ_DIR)\inkey.obj \
@@ -665,40 +668,35 @@ VM_LIB_OBJS = \
 #

 GTCGI_LIB_OBJS = \
-   $(OBJ_DIR)\gtcgi.obj \
-   $(OBJ_DIR)\mousecgi.obj
+   $(OBJ_DIR)\gtcgi.obj

 #
 # GTDOS.LIB rules
 #

 GTDOS_LIB_OBJS = \
-   $(OBJ_DIR)\gtdos.obj \
-   $(OBJ_DIR)\mousedos.obj
+   $(OBJ_DIR)\gtdos.obj

 #
 # GTPCA.LIB rules
 #

 GTPCA_LIB_OBJS = \
-   $(OBJ_DIR)\gtpca.obj \
-   $(OBJ_DIR)\mousepca.obj
+   $(OBJ_DIR)\gtpca.obj

 #
 # GTSTD.LIB rules
 #

 GTSTD_LIB_OBJS = \
-   $(OBJ_DIR)\gtstd.obj \
-   $(OBJ_DIR)\mousestd.obj
+   $(OBJ_DIR)\gtstd.obj

 #
 # GTWIN.LIB rules
 #

 GTWIN_LIB_OBJS = \
-   $(OBJ_DIR)\gtwin.obj \
-   $(OBJ_DIR)\mousewin.obj
+   $(OBJ_DIR)\gtwin.obj

 #
 # HARBOUR.EXE rules
@@ -708,6 +706,8 @@ HARBOUR_EXE_OBJS = \
   $(OBJ_DIR)\harbour.obj \
   $(OBJ_DIR)\harboury.obj \
   $(OBJ_DIR)\cmdcheck.obj \
+   $(OBJ_DIR)\hbdead.obj \
+   $(OBJ_DIR)\hbstripl.obj \
   $(OBJ_DIR)\hbusage.obj \
   $(OBJ_DIR)\hbident.obj \
   $(OBJ_DIR)\hbgenerr.obj \
@@ -953,6 +953,8 @@ $(HARBOUR_EXE) : $(HARBOUR_EXE_OBJS)
   $(ECHO) $(OBJ_DIR)\harbourl.obj >> make.tmp
 !endif
   $(ECHO) $(OBJ_DIR)\cmdcheck.obj >> make.tmp
+   $(ECHO) $(OBJ_DIR)\hbdead.obj >> make.tmp
+   $(ECHO) $(OBJ_DIR)\hbstripl.obj >> make.tmp
   $(ECHO) $(OBJ_DIR)\hbusage.obj >> make.tmp
   $(ECHO) $(OBJ_DIR)\hbident.obj >> make.tmp
   $(ECHO) $(OBJ_DIR)\hbgenerr.obj >> make.tmp
@@ -1010,6 +1012,12 @@ $(OBJ_DIR)\harbourl.obj : $(OBJ_DIR)\harbourl.c
 $(OBJ_DIR)\cmdcheck.obj : $(COMPILER_DIR)\cmdcheck.c
   $(CC) $(CLIBFLAGS) -o$@ $**

+$(OBJ_DIR)\hbdead.obj : $(COMPILER_DIR)\hbdead.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+
+$(OBJ_DIR)\hbstripl.obj : $(COMPILER_DIR)\hbstripl.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+
 $(OBJ_DIR)\hbusage.obj : $(COMPILER_DIR)\hbusage.c
   $(CC) $(CLIBFLAGS) -o$@ $**

@@ -1598,6 +1606,14 @@ $(OBJ_DIR)\gtapiu.obj : $(RTL_DIR)\gtapiu.c
   $(CC) $(CLIBFLAGS) -o$@ $**
   tlib $(RTL_LIB) $(ARFLAGS) -+$@,,

+$(OBJ_DIR)\gtfunc.obj : $(RTL_DIR)\gtfunc.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
+
+$(OBJ_DIR)\gtsys.obj : $(RTL_DIR)\gtsys.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\gx.obj : $(RTL_DIR)\gx.c
   $(CC) $(CLIBFLAGS) -o$@ $**
   tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
@@ -1610,6 +1626,10 @@ $(OBJ_DIR)\hbffind.obj : $(RTL_DIR)\hbffind.c
   $(CC) $(CLIBFLAGS) -o$@ $**
   tlib $(RTL_LIB) $(ARFLAGS) -+$@,,

+$(OBJ_DIR)\hbgtcore.obj : $(RTL_DIR)\hbgtcore.c
+   $(CC) $(CLIBFLAGS) -o$@ $**
+   tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
+
 $(OBJ_DIR)\hbrandom.obj : $(RTL_DIR)\hbrandom.c
   $(CC) $(CLIBFLAGS) -o$@ $**
   tlib $(RTL_LIB) $(ARFLAGS) -+$@,,
@@ -2771,10 +2791,6 @@ $(OBJ_DIR)\gtcgi.obj : $(RTL_DIR)\gtcgi\gtcgi.c
   $(CC) $(CLIBFLAGS) -o$@ $**
   tlib $(GTCGI_LIB) $(ARFLAGS) -+$@,,

-$(OBJ_DIR)\mousecgi.obj : $(RTL_DIR)\gtcgi\mousecgi.c
-   $(CC) $(CLIBFLAGS) -o$@ $**
-   tlib $(GTCGI_LIB) $(ARFLAGS) -+$@,,
-
 #
 # GTDOS.LIB dependencies
 #
@@ -2783,10 +2799,6 @@ $(OBJ_DIR)\gtdos.obj : $(RTL_DIR)\gtdos\gtdos.c
   $(CC) $(CLIBFLAGS) -o$@ $**
   tlib $(GTDOS_LIB) $(ARFLAGS) -+$@,,

-$(OBJ_DIR)\mousedos.obj : $(RTL_DIR)\gtdos\mousedos.c
-   $(CC) $(CLIBFLAGS) -o$@ $**
-   tlib $(GTDOS_LIB) $(ARFLAGS) -+$@,,
-
 #
 # GTPCA.LIB dependencies
 #
@@ -2795,10 +2807,6 @@ $(OBJ_DIR)\gtpca.obj : $(RTL_DIR)\gtpca\gtpca.c
   $(CC) $(CLIBFLAGS) -o$@ $**
   tlib $(GTPCA_LIB) $(ARFLAGS) -+$@,,

-$(OBJ_DIR)\mousepca.obj : $(RTL_DIR)\gtpca\mousepca.c
-   $(CC) $(CLIBFLAGS) -o$@ $**
-   tlib $(GTPCA_LIB) $(ARFLAGS) -+$@,,
-
 #
 # GTSTD.LIB dependencies
 #
@@ -2807,10 +2815,6 @@ $(OBJ_DIR)\gtstd.obj : $(RTL_DIR)\gtstd\gtstd.c
   $(CC) $(CLIBFLAGS) -o$@ $**
   tlib $(GTSTD_LIB) $(ARFLAGS) -+$@,,

-$(OBJ_DIR)\mousestd.obj : $(RTL_DIR)\gtstd\mousestd.c
-   $(CC) $(CLIBFLAGS) -o$@ $**
-   tlib $(GTSTD_LIB) $(ARFLAGS) -+$@,,
-
 #
 # GTWIN.LIB dependencies
 #
@@ -2819,10 +2823,6 @@ $(OBJ_DIR)\gtwin.obj : $(RTL_DIR)\gtwin\gtwin.c
   $(CC) $(CLIBFLAGS) -o$@ $**
   tlib $(GTWIN_LIB) $(ARFLAGS) -+$@,,

-$(OBJ_DIR)\mousewin.obj : $(RTL_DIR)\gtwin\mousewin.c
-   $(CC) $(CLIBFLAGS) -o$@ $**
-   tlib $(GTWIN_LIB) $(ARFLAGS) -+$@,,
-
 #
 # HBPP.EXE dependencies
 #
--- a/harbour/source/codepage/cdpbg866.c
+++ b/harbour/source/codepage/cdpbg866.c
@@ -58,7 +58,7 @@
 #include "hbapi.h"
 #include "hbapicdp.h"

-#define NUMBER_OF_CHARACTERS  30    /* The number of single characters in the
+#define NUMBER_OF_CHARACTERS  32    /* The number of single characters in the
                                       alphabet, two-as-one aren't considered
                                       here, accented - are considered. */
 #define IS_LATIN               0    /* Should be 1, if the national alphabet
@@ -85,8 +85,8 @@

 static HB_CODEPAGE s_codepage = { "BG866",
    CPID_866, UNITB_866, NUMBER_OF_CHARACTERS,
-    "€<EFBFBD>‚ƒ„…†‡ˆ‰Š‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™šœžŸ",
-    " ¡¢£¤¥¦§¨©ª«¬®¯àáâãäåæçèéêìîï",
+    "€<EFBFBD>‚ƒ„…†‡ˆ‰Š‹Œ<EFBFBD>Ž<EFBFBD><EFBFBD>‘’“”•–—˜™š›œ<EFBFBD>žŸ",
+    " ¡¢£¤¥¦§¨©ª«¬®¯àáâãäåæçèéêëìíîï",
    IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };

 HB_CODEPAGE_INIT( BG866 );
--- a/harbour/source/codepage/cdpbgiso.c
+++ b/harbour/source/codepage/cdpbgiso.c
@@ -58,7 +58,7 @@
 #include "hbapi.h"
 #include "hbapicdp.h"

-#define NUMBER_OF_CHARACTERS  30    /* The number of single characters in the
+#define NUMBER_OF_CHARACTERS  32    /* The number of single characters in the
                                       alphabet, two-as-one aren't considered
                                       here, accented - are considered. */
 #define IS_LATIN               0    /* Should be 1, if the national alphabet
@@ -85,8 +85,8 @@

 static HB_CODEPAGE s_codepage = { "BGISO",
    CPID_8859_5, UNITB_8859_5, NUMBER_OF_CHARACTERS,
-    "°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊÌÎÏ",
-    "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêìîï",
+    "°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ",
+    "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîï",
    IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };

 HB_CODEPAGE_INIT( BGISO );
--- a/harbour/source/codepage/cdpbgwin.c
+++ b/harbour/source/codepage/cdpbgwin.c
@@ -58,7 +58,7 @@
 #include "hbapi.h"
 #include "hbapicdp.h"

-#define NUMBER_OF_CHARACTERS  30    /* The number of single characters in the
+#define NUMBER_OF_CHARACTERS  32    /* The number of single characters in the
                                       alphabet, two-as-one aren't considered
                                       here, accented - are considered. */
 #define IS_LATIN               0    /* Should be 1, if the national alphabet
@@ -85,8 +85,8 @@

 static HB_CODEPAGE s_codepage = { "BGWIN",
    CPID_1251, UNITB_1251, NUMBER_OF_CHARACTERS,
-    "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÜÞß",
-    "àáâãäåæçèéêëìíîïðñòóôõö÷øùúüþÿ",
+    "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß",
+    "àáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþÿ",
    IS_LATIN, ACCENTED_EQUAL, ACCENTED_INTERLEAVED, 0, 0, NULL, NULL, NULL, NULL, 0, NULL };

 HB_CODEPAGE_INIT( BGWIN );
--- a/harbour/source/rtl/gtpca/gtpca.c
+++ b/harbour/source/rtl/gtpca/gtpca.c
@@ -344,7 +344,7 @@ static void hb_gt_pca_AnsiSetAttributes( int iAttr )
   }
 }

-static void hb_gt_pca_AnsiInit()
+static void hb_gt_pca_AnsiInit( void )
 {
   s_iCurrentSGR = s_iRow = s_iCol = s_iCursorStyle = s_iAM = -1;
 }
@@ -370,7 +370,7 @@ static void hb_gt_pca_setKeyTrans( char * pSrcChars, char * pDstChars )
   if( pSrcChars && pDstChars )
   {
      BYTE c;
-      for( i = 0; i < 256 && ( c = ( BYTE ) pSrcChars[ i ] ); ++i )
+      for( i = 0; i < 256 && ( c = ( BYTE ) pSrcChars[ i ] ) != 0; ++i )
         s_keyTransTbl[ c ] = ( BYTE ) pDstChars[ i ];
   }
 }
--- a/harbour/source/rtl/gtstd/gtstd.c
+++ b/harbour/source/rtl/gtstd/gtstd.c
@@ -147,7 +147,7 @@ static void hb_gt_std_setKeyTrans( char * pSrcChars, char * pDstChars )
   if( pSrcChars && pDstChars )
   {
      BYTE c;
-      for( i = 0; i < 256 && ( c = ( BYTE ) pSrcChars[ i ] ); ++i )
+      for( i = 0; i < 256 && ( c = ( BYTE ) pSrcChars[ i ] ) != 0; ++i )
         s_keyTransTbl[ c ] = ( BYTE ) pDstChars[ i ];
   }
 }
--- a/harbour/source/rtl/hbgtcore.c
+++ b/harbour/source/rtl/hbgtcore.c
@@ -1379,7 +1379,7 @@ static BOOL hb_gt_def_Resize( int iRows, int iCols )
      {
         BYTE * pBuffer = NULL;
         ULONG ulLen = ( ULONG ) iRows * iCols, ulIndex;
-         ULONG ulSize = 0;
+         ULONG ulSize;
         int i;

         ulSize = hb_gt_RectSize( 0, 0, iRows - 1, iCols - 1 );
--- a/harbour/source/vm/arrays.c
+++ b/harbour/source/vm/arrays.c
@@ -786,7 +786,6 @@ static void hb_arrayCloneTo( PHB_BASEARRAY pSrcBaseArray, PHB_BASEARRAY pDstBase

   pSrcItem = pSrcBaseArray->pItems;
   pDstItem = pDstBaseArray->pItems;
-   ulLen = pSrcBaseArray->ulLen;

   pDstBaseArray->uiClass = pSrcBaseArray->uiClass;

--- a/harbour/source/vm/mainwin.c
+++ b/harbour/source/vm/mainwin.c
@@ -84,6 +84,7 @@ int WINAPI WinMain( HINSTANCE hInstance,      /* handle to current instance */

   HB_SYMBOL_UNUSED( hPrevInstance );
   HB_SYMBOL_UNUSED( iCmdShow );
+   HB_SYMBOL_UNUSED( ef );

   hb_hInstance = hInstance;
   GetModuleFileName( hInstance, szAppName, 249 );