From 7e4f3a579c1b5e358bf2a145565e28d661760897 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 2 Mar 2009 10:55:35 +0000 Subject: [PATCH] 2009-03-02 11:55 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * config/global.cf ! Corrected GNU Make doc link. * INSTALL * Updates. * contrib/xhb/regexrpl.prg * contrib/gtwvg/gtwvg.c ! Fixed warnings. --- harbour/ChangeLog | 11 +++++++++++ harbour/INSTALL | 5 ++++- harbour/config/global.cf | 2 +- harbour/contrib/gtwvg/gtwvg.c | 2 +- harbour/contrib/xhb/regexrpl.prg | 5 +++-- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 32b37fc9cf..965d6f76cd 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,17 @@ 2009-12-31 13:59 UTC+0100 Foo Bar (foo.bar foobar.org) */ +2009-03-02 11:55 UTC+0100 Viktor Szakats (harbour.01 syenar hu) + * config/global.cf + ! Corrected GNU Make doc link. + + * INSTALL + * Updates. + + * contrib/xhb/regexrpl.prg + * contrib/gtwvg/gtwvg.c + ! Fixed warnings. + 2009-03-02 09:43 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * include/hbapi.h * source/rtl/hbstrfmt.c diff --git a/harbour/INSTALL b/harbour/INSTALL index 95b340791b..fc79bd5a5e 100644 --- a/harbour/INSTALL +++ b/harbour/INSTALL @@ -56,6 +56,9 @@ HOW TO BUILD AND INSTALL HARBOUR 1.) Windows NT or compatible system is required to build Harbour. 2.) Make sure to have your C compiler of choice properly installed. + You should make sure no tools in your PATH belonging to other + C compilers are interfering with your setup (put all these + _after_ your selected C compiler in PATH). For the list of supported compilers, please look up the relevant section of this file. 3.) Make sure to have GNU Make. We recommend the one distributed @@ -204,7 +207,7 @@ OPTIONS AVAILABLE WHEN BUILDING HARBOUR left empty. - HB_CONTRIB_ADDONS= Build additional libraries stored in the contrib directory. - - HB_REBUILD_PARSER=yes To rebuild the language parses. + - HB_REBUILD_PARSER=yes To rebuild the language parsers. This requires GNU Bison. - HB_VISUALC_VER_PRE80=yes Set this if you're using a pre-8.0 (= pre-MSVS 2005) version of MSVC compiler. diff --git a/harbour/config/global.cf b/harbour/config/global.cf index 03080df5a6..de8040bb18 100644 --- a/harbour/config/global.cf +++ b/harbour/config/global.cf @@ -3,7 +3,7 @@ # # See GNU make docs here: -# http://www.gnu.org/software/automake/manual/make/ +# http://www.gnu.org/software/make/manual/make.html # This isn't strictly necessary, but it does signficantly reduce # the number of rules that make has to evaluate otherwise, which may give diff --git a/harbour/contrib/gtwvg/gtwvg.c b/harbour/contrib/gtwvg/gtwvg.c index 81ccdd401d..b8b9a80bc0 100644 --- a/harbour/contrib/gtwvg/gtwvg.c +++ b/harbour/contrib/gtwvg/gtwvg.c @@ -2366,7 +2366,7 @@ static HWND hb_gt_wvt_CreateWindow( PHB_GTWVT pWVT, BOOL bResizable ) } if( ! bResizable ) - pWVT->pPP->style = ( pWVT->pPP->style &~ ( WS_THICKFRAME | WS_MAXIMIZEBOX ) | WS_BORDER ); + pWVT->pPP->style = ( ( pWVT->pPP->style &~ ( WS_THICKFRAME | WS_MAXIMIZEBOX ) ) | WS_BORDER ); hWnd = CreateWindowEx( pWVT->pPP->exStyle, /* extended style */ diff --git a/harbour/contrib/xhb/regexrpl.prg b/harbour/contrib/xhb/regexrpl.prg index f55cccf417..29fabd9ff7 100644 --- a/harbour/contrib/xhb/regexrpl.prg +++ b/harbour/contrib/xhb/regexrpl.prg @@ -61,7 +61,8 @@ FUNCTION hb_RegexReplace( cRegex, cString, cReplace, lCaseSensitive, lNewLine, n LOCAL aMatches, aMatch LOCAL cReturn LOCAL nOffSet := 0 - LOCAL cSearch, nStart, nEnd, nLenSearch, nLenReplace + LOCAL cSearch, nStart, nLenSearch, nLenReplace + //LOCAL nEnd IF !HB_ISREGEXSTRING( cRegex ) pRegex := HB_RegExComp( cRegEx ) @@ -78,7 +79,7 @@ FUNCTION hb_RegexReplace( cRegex, cString, cReplace, lCaseSensitive, lNewLine, n IF Len( aMatch ) == 3 // if regex matches I must have an array of 3 elements cSearch := aMatch[ MATCH_STRING ] nStart := aMatch[ MATCH_START ] - nEnd := aMatch[ MATCH_END ] + //nEnd := aMatch[ MATCH_END ] nLenSearch := Len( cSearch ) //nEnd - nStart + 1 nLenReplace := Len( cReplace ) //TraceLog( "SubStr( cString, nStart, nLenSearch )", ;