diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f81747c4c8..90bec4f3c0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -1,4 +1,4 @@ -/* +/* * $Id$ */ @@ -8,6 +8,23 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-12-17 21:40 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) + * bin/bld.bat + ! %HB_USER_LIBS% (for bcc32) moved to the beginning of the lib list. + + * contrib/mtpl_b32.mak + ! Fixed preprocessor error in line 190 when HB_INSTALL_PREFIX != HB_ROOT + + * source/rtl/getsys53.prg + * source/rtl/getsys.prg + ! Moved ReadStats() to getsys52.prg + + * ChangeLog + ! Removed UTF-8 signature from the beginning of the file. + Unfortunately accented chars got converted to UTF8, which + would need to fixed. + Pritpal, please turn off this feature on your editor for Harbour. + 2007-12-17 21:21 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/include/hbapigt.h * harbour/include/hbgtcore.h @@ -36566,7 +36583,7 @@ e.vc * Changed PP_Main() to STATIC Main() to have a Main procedure for build that require a MAIN yet avoid conflict if linked with a prg including a MAIN. * contrib/dot/pp_harb.ch * Wrapped a Windows specific code within #ifdef WIN. - /* Thanks to input from Toma� Zupan. */ + /* Thanks to input from Tomas Zupan. */ * source/pp/ppcore.c ! Added a BOOL 2nd parameter to isExpres() to flag a LIST MP. This fixes problem with matching a list exp with an empty component. diff --git a/harbour/bin/bld.bat b/harbour/bin/bld.bat index aef9d0a04a..b60498dc74 100644 --- a/harbour/bin/bld.bat +++ b/harbour/bin/bld.bat @@ -208,7 +208,7 @@ 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 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 %HB_USER_LIBS% + if "%HB_COMPILER%" == "bcc32" bcc32 -O2 -d %CFLAGS% -I%HB_INC_INSTALL% -L%HB_LIB_INSTALL% %1.c %HB_USER_LIBS% 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% -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 diff --git a/harbour/contrib/mtpl_b32.mak b/harbour/contrib/mtpl_b32.mak index 5c08a59051..091f32c4b5 100644 --- a/harbour/contrib/mtpl_b32.mak +++ b/harbour/contrib/mtpl_b32.mak @@ -180,8 +180,10 @@ doClean: !if "$(HB_INSTALL_PREFIX)" == "$(HB_ROOT)" @if exist $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) $(DEL) $(HB_LIB_INSTALL)\$(LIBNAME)$(LIBEXT) > nul +!endif @$(ECHO) @echo off > _hbdelho.bat @$(ECHO) if %1x == x goto SKIP >> _hbdelho.bat + @$(ECHO) if $(HB_INSTALL_PREFIX)x == $(HB_ROOT)x goto SKIP >> _hbdelho.bat @$(ECHO) if exist $(HB_INC_INSTALL)\%1 $(DEL) $(HB_INC_INSTALL)\%1 >> _hbdelho.bat @$(ECHO) :SKIP >> _hbdelho.bat @type &&! @@ -191,7 +193,6 @@ doClean: @_hbdelha.bat @if exist _hbdelha.bat $(DEL) _hbdelha.bat > nul @if exist _hbdelho.bat $(DEL) _hbdelho.bat > nul -!endif #********************************************************** # INSTALL rule(s) diff --git a/harbour/source/rtl/getsys.prg b/harbour/source/rtl/getsys.prg index f64fe67c29..c8cd53dd85 100644 --- a/harbour/source/rtl/getsys.prg +++ b/harbour/source/rtl/getsys.prg @@ -275,19 +275,6 @@ PROCEDURE __SetFormat( bFormat ) RETURN -FUNCTION ReadStats( nElement, xNewValue ) - LOCAL oGetList := __GetListActive() - - IF oGetList != NIL - IF PCount() > 1 - RETURN oGetList:ReadStats( nElement, xNewValue ) - ELSE - RETURN oGetList:ReadStats( nElement ) - ENDIF - ENDIF - - RETURN NIL - #define SCORE_ROW 0 #define SCORE_COL 60 diff --git a/harbour/source/rtl/getsys53.prg b/harbour/source/rtl/getsys53.prg index 3ef3e6f13c..77a9b4ef9f 100644 --- a/harbour/source/rtl/getsys53.prg +++ b/harbour/source/rtl/getsys53.prg @@ -159,4 +159,17 @@ FUNCTION EraseGetMsg( oGet, aMsg ) RETURN NIL +FUNCTION ReadStats( nElement, xNewValue ) + LOCAL oGetList := __GetListActive() + + IF oGetList != NIL + IF PCount() > 1 + RETURN oGetList:ReadStats( nElement, xNewValue ) + ELSE + RETURN oGetList:ReadStats( nElement ) + ENDIF + ENDIF + + RETURN NIL + #endif