From a75f57da55a7d69d886cab735e328036696e861e Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Thu, 2 Dec 2010 10:20:06 +0000 Subject: [PATCH] 2010-12-02 11:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/codepage/cpcs852.c * harbour/src/codepage/cpcskam.c * harbour/src/codepage/cpcsiso.c * harbour/src/codepage/cpcswin.c ! switched from HB_CDP_ACSORT_INTERLEAVED to HB_CDP_ACSORT_NONE in Czech code pages. * harbour/config/win/bcc.mk * disable explicitly some common BCC warnings in 3rd party code which we can safely ignore when HB_BUILD_WARN=no * harbour/utils/hbmk2/hbmk2.prg * disable explicitly some common BCC warnings which we can safely ignore when warning level is set to low * harbour/contrib/hbmisc/bbabble.c * removed unnecessary incrementation to pacify compile warning --- harbour/ChangeLog | 19 +++++++++++++++++++ harbour/config/win/bcc.mk | 4 +++- harbour/contrib/hbmisc/bbabble.c | 2 +- harbour/src/codepage/cpcs852.c | 6 +++--- harbour/src/codepage/cpcsiso.c | 6 +++--- harbour/src/codepage/cpcskam.c | 6 +++--- harbour/src/codepage/cpcswin.c | 6 +++--- harbour/utils/hbmk2/hbmk2.prg | 2 +- 8 files changed, 36 insertions(+), 15 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 9b8abbc0c6..1e7bd8d9a6 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,25 @@ The license applies to all entries newer than 2009-04-28. */ +2010-12-02 11:19 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/src/codepage/cpcs852.c + * harbour/src/codepage/cpcskam.c + * harbour/src/codepage/cpcsiso.c + * harbour/src/codepage/cpcswin.c + ! switched from HB_CDP_ACSORT_INTERLEAVED to HB_CDP_ACSORT_NONE in + Czech code pages. + + * harbour/config/win/bcc.mk + * disable explicitly some common BCC warnings in 3rd party code + which we can safely ignore when HB_BUILD_WARN=no + + * harbour/utils/hbmk2/hbmk2.prg + * disable explicitly some common BCC warnings which we can safely + ignore when warning level is set to low + + * harbour/contrib/hbmisc/bbabble.c + * removed unnecessary incrementation to pacify compile warning + 2010-11-30 23:25 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rdd/dbfntx/dbfntx1.c * harbour/src/rdd/dbfnsx/dbfnsx1.c diff --git a/harbour/config/win/bcc.mk b/harbour/config/win/bcc.mk index d2f2a4bfe3..4457d3eed4 100644 --- a/harbour/config/win/bcc.mk +++ b/harbour/config/win/bcc.mk @@ -18,7 +18,9 @@ CFLAGS += -I. -I$(HB_HOST_INC) CFLAGS += -q -tWM -CP437 -ifneq ($(HB_BUILD_WARN),no) +ifeq ($(HB_BUILD_WARN),no) + CFLAGS += -w-sig- -w-aus- -w-ccc- -w-csu- -w-par- -w-rch- -w-ucp- -w-use- -w-prc- +else CFLAGS += -w -Q -w-sig- endif diff --git a/harbour/contrib/hbmisc/bbabble.c b/harbour/contrib/hbmisc/bbabble.c index c6d5f6468a..ea7de034d7 100644 --- a/harbour/contrib/hbmisc/bbabble.c +++ b/harbour/contrib/hbmisc/bbabble.c @@ -107,7 +107,7 @@ HB_FUNC( BUBBLEBABBLEENCODE ) } pszResult[ nPos++ ] = 'x'; - pszResult[ nPos++ ] = '\0'; + pszResult[ nPos ] = '\0'; hb_retc_buffer( pszResult ); } diff --git a/harbour/src/codepage/cpcs852.c b/harbour/src/codepage/cpcs852.c index 9a8bf1c857..536c16ba41 100644 --- a/harbour/src/codepage/cpcs852.c +++ b/harbour/src/codepage/cpcs852.c @@ -54,9 +54,9 @@ #define HB_CP_ID CS852 #define HB_CP_INFO "Czech CP-852" #define HB_CP_UNITB HB_UNITB_852 -#define HB_CP_ACSORT HB_CDP_ACSORT_INTERLEAVED -#define HB_CP_UPPER "A~~BCD~E~~~FGH.CH.I~JKLMN~O~~PQRST~U~~~VWXY~Z" -#define HB_CP_LOWER "a~~bcd~e~~~fgh.ch.i~jklmn~o~~pqrst~u~~~vwxy~z" +#define HB_CP_ACSORT HB_CDP_ACSORT_NONE +#define HB_CP_UPPER "ABCDEFGH.CH.IJKLMNOPQRSTUޚVWXYZ" +#define HB_CP_LOWER "abcde؉fgh.ch.ijklmnopqrstuvwxyz" /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpcsiso.c b/harbour/src/codepage/cpcsiso.c index 81c0800c85..06e9ae7701 100644 --- a/harbour/src/codepage/cpcsiso.c +++ b/harbour/src/codepage/cpcsiso.c @@ -54,9 +54,9 @@ #define HB_CP_ID CSISO #define HB_CP_INFO "Czech ISO-8859-2" #define HB_CP_UNITB HB_UNITB_8859_2 -#define HB_CP_ACSORT HB_CDP_ACSORT_INTERLEAVED -#define HB_CP_UPPER "A~~BCD~E~~~FGH.CH.I~JKLMN~O~~PQRST~U~~~VWXY~Z" -#define HB_CP_LOWER "a~~bcd~e~~~fgh.ch.i~jklmn~o~~pqrst~u~~~vwxy~z" +#define HB_CP_ACSORT HB_CDP_ACSORT_NONE +#define HB_CP_UPPER "ABCDEFGH.CH.IJKLMNOPQRSTUVWXYZ" +#define HB_CP_LOWER "abcdefgh.ch.ijklmnopqrstuvwxyz" /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpcskam.c b/harbour/src/codepage/cpcskam.c index d45fa1d520..c1162511ef 100644 --- a/harbour/src/codepage/cpcskam.c +++ b/harbour/src/codepage/cpcskam.c @@ -54,9 +54,9 @@ #define HB_CP_ID CSKAM #define HB_CP_INFO "Czech Kamenicky (895)" #define HB_CP_UNITB HB_UNITB_KAM -#define HB_CP_ACSORT HB_CDP_ACSORT_INTERLEAVED -#define HB_CP_UPPER "A~~BCD~E~~FGH.CH.I~JKLMN~O~~PQRST~U~~~VWXY~Z" -#define HB_CP_LOWER "a~~bcd~e~~fgh.ch.i~jklmn~o~~pqrst~u~~~vwxy~z" +#define HB_CP_ACSORT HB_CDP_ACSORT_NONE +#define HB_CP_UPPER "ABCDEFGH.CH.IJKLMNOPQRSTUVWXYZ" +#define HB_CP_LOWER "abcdefgh.ch.ijklmnopqrstuvwxyz" /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/src/codepage/cpcswin.c b/harbour/src/codepage/cpcswin.c index 48a9f64b88..d3b018a9b5 100644 --- a/harbour/src/codepage/cpcswin.c +++ b/harbour/src/codepage/cpcswin.c @@ -54,9 +54,9 @@ #define HB_CP_ID CSWIN #define HB_CP_INFO "Czech Windows-1250" #define HB_CP_UNITB HB_UNITB_1250 -#define HB_CP_ACSORT HB_CDP_ACSORT_INTERLEAVED -#define HB_CP_UPPER "A~~BCD~E~~~FGH.CH.I~JKLMN~O~~PQRST~U~~~VWXY~Z" -#define HB_CP_LOWER "a~~bcd~e~~~fgh.ch.i~jklmn~o~~pqrst~u~~~vwxy~z" +#define HB_CP_ACSORT HB_CDP_ACSORT_NONE +#define HB_CP_UPPER "ABCDEFGH.CH.IJKLMNOPQRSTUVWXYZ" +#define HB_CP_LOWER "abcdefgh.ch.ijklmnopqrstuvwxyz" /* include CP registration code */ #include "hbcdpreg.h" diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg index 7327cf5860..178b2573e8 100644 --- a/harbour/utils/hbmk2/hbmk2.prg +++ b/harbour/utils/hbmk2/hbmk2.prg @@ -3961,7 +3961,7 @@ FUNCTION hbmk2( aArgs, nArgTarget, /* @ */ lPause, nLevel ) SWITCH hbmk[ _HBMK_nWARN ] CASE _WARN_MAX ; AAdd( hbmk[ _HBMK_aOPTC ], "-w -Q" ) ; EXIT CASE _WARN_YES ; AAdd( hbmk[ _HBMK_aOPTC ], "-w -Q -w-sig-" ) ; EXIT - CASE _WARN_LOW ; EXIT + CASE _WARN_LOW ; AAdd( hbmk[ _HBMK_aOPTC ], "-w-sig- -w-aus- -w-ccc- -w-csu- -w-par- -w-rch- -w-ucp- -w-use- -w-prc-" ) ; EXIT CASE _WARN_NO ; AAdd( hbmk[ _HBMK_aOPTC ], "-w-" ) ; EXIT ENDSWITCH cOpt_CompC += " {FC} {LC}"