diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 610d40ce42..01057af31e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,27 @@ The license applies to all entries newer than 2009-04-28. */ +2010-12-17 02:00 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/src/rtl/cdpapi.c + * removed dummy assignment + + * harbour/src/lang/msgpl852.c + * harbour/src/lang/msgplmaz.c + * harbour/src/lang/msgpliso.c + * harbour/src/lang/msgplwin.c + ! fixed one message translation + + * harbour/config/dos/watcom.mk + * harbour/config/win/watcom.mk + * harbour/config/linux/watcom.mk + * harbour/config/os2/watcom.mk + * disable explicitly some Open Watcom warnings in 3rd party code + which we can safely ignore when HB_BUILD_WARN='no' + + * harbour/utils/hbmk2/hbmk2.prg + * disable explicitly some Open Watcom warnings in 3rd party code + which we can safely ignore when warning level is low + 2010-12-15 10:42 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * ChangeLog ! Fixed TZ in my recent entry headers. diff --git a/harbour/config/dos/watcom.mk b/harbour/config/dos/watcom.mk index 9011a70d26..78c6cf1fe6 100644 --- a/harbour/config/dos/watcom.mk +++ b/harbour/config/dos/watcom.mk @@ -23,7 +23,7 @@ LDFLAGS += OP quiet ifneq ($(HB_BUILD_WARN),no) CFLAGS += -w3 else - CFLAGS += -w1 + CFLAGS += -w1 -wcd124 -wcd136 -wcd201 -wcd367 -wcd368 endif ifneq ($(HB_BUILD_OPTIM),no) diff --git a/harbour/config/linux/watcom.mk b/harbour/config/linux/watcom.mk index e1eed4d334..9922435aed 100644 --- a/harbour/config/linux/watcom.mk +++ b/harbour/config/linux/watcom.mk @@ -22,7 +22,7 @@ LDFLAGS += OP quiet ifneq ($(HB_BUILD_WARN),no) CFLAGS += -w3 else - CFLAGS += -w1 + CFLAGS += -w1 -wcd124 -wcd136 -wcd201 -wcd367 -wcd368 endif ifneq ($(HB_BUILD_OPTIM),no) diff --git a/harbour/config/os2/watcom.mk b/harbour/config/os2/watcom.mk index 7e2c6d8a66..e82292e30a 100644 --- a/harbour/config/os2/watcom.mk +++ b/harbour/config/os2/watcom.mk @@ -24,7 +24,7 @@ LDFLAGS += OP quiet ifneq ($(HB_BUILD_WARN),no) CFLAGS += -w3 else - CFLAGS += -w1 + CFLAGS += -w1 -wcd124 -wcd136 -wcd201 -wcd367 -wcd368 endif ifneq ($(HB_BUILD_OPTIM),no) diff --git a/harbour/config/win/watcom.mk b/harbour/config/win/watcom.mk index 250f0b9136..e36abab83f 100644 --- a/harbour/config/win/watcom.mk +++ b/harbour/config/win/watcom.mk @@ -24,7 +24,7 @@ LDFLAGS += OP quiet ifneq ($(HB_BUILD_WARN),no) CFLAGS += -w3 else - CFLAGS += -w1 + CFLAGS += -w1 -wcd124 -wcd136 -wcd201 -wcd367 -wcd368 endif ifneq ($(HB_BUILD_OPTIM),no) diff --git a/harbour/src/lang/msgpl852.c b/harbour/src/lang/msgpl852.c index b958b879c2..fab23f08cf 100644 --- a/harbour/src/lang/msgpl852.c +++ b/harbour/src/lang/msgpl852.c @@ -143,7 +143,7 @@ static HB_LANG s_lang = "", "Nieprawidˆowa operacja", "Przekroczony limit", - "Uszkodzony indeks bazy", + "Wykryto uszkodzenie danych", "Niezgodny typ danych", "Warto˜† poza zakresem", "Baza nie jest otwarta", diff --git a/harbour/src/lang/msgpliso.c b/harbour/src/lang/msgpliso.c index c06701d862..d5b4772ca9 100644 --- a/harbour/src/lang/msgpliso.c +++ b/harbour/src/lang/msgpliso.c @@ -143,7 +143,7 @@ static HB_LANG s_lang = "", "Nieprawidłowa operacja", "Przekroczony limit", - "Uszkodzony indeks bazy", + "Wykryto uszkodzenie danych", "Niezgodny typ danych", "Wartość poza zakresem", "Baza jest nie otwarta", diff --git a/harbour/src/lang/msgplmaz.c b/harbour/src/lang/msgplmaz.c index 4b9641a850..4ff3d4f132 100644 --- a/harbour/src/lang/msgplmaz.c +++ b/harbour/src/lang/msgplmaz.c @@ -143,7 +143,7 @@ static HB_LANG s_lang = "", "Nieprawid’owa operacja", "Przekroczony limit", - "Uszkodzony indeks bazy", + "Wykryto uszkodzenie danych", "Niezgodny typ danych", "Wartož poza zakresem", "Baza jest nie otwarta", diff --git a/harbour/src/lang/msgplwin.c b/harbour/src/lang/msgplwin.c index 264894e1e7..223a4eebc2 100644 --- a/harbour/src/lang/msgplwin.c +++ b/harbour/src/lang/msgplwin.c @@ -143,7 +143,7 @@ static HB_LANG s_lang = "", "Nieprawidłowa operacja", "Przekroczony limit", - "Uszkodzony indeks bazy", + "Wykryto uszkodzenie danych", "Niezgodny typ danych", "Wartoœć poza zakresem", "Baza jest nie otwarta", diff --git a/harbour/src/rtl/cdpapi.c b/harbour/src/rtl/cdpapi.c index 607abd1f65..bd55faca21 100644 --- a/harbour/src/rtl/cdpapi.c +++ b/harbour/src/rtl/cdpapi.c @@ -2094,7 +2094,7 @@ static PHB_CODEPAGE hb_buildCodePage( const char * id, const char * info, { if( iAcc && nACSort != HB_CDP_ACSORT_NONE ) ++iAccUp; - iSortLo = ++iSortUp; + ++iSortUp; } iAccLo = iAccUp; iSortLo = iSortUp; diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index c0430e2e46..979f5fe7bf 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3788,7 +3788,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) SWITCH hbmk[ _HBMK_nWARN ] CASE _WARN_MAX ; AAdd( hbmk[ _HBMK_aOPTC ], "-wx" ) ; EXIT CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-w3" ) ; EXIT - CASE _WARN_LOW ; AAdd( hbmk[ _HBMK_aOPTC ], "-w1" ) ; EXIT + CASE _WARN_LOW ; AAdd( hbmk[ _HBMK_aOPTC ], "-w1 -wcd124 -wcd136 -wcd201 -wcd367 -wcd368" ) ; EXIT CASE _WARN_NO ; AAdd( hbmk[ _HBMK_aOPTC ], "-w0" ) ; EXIT ENDSWITCH DO CASE