diff options
-rw-r--r-- | src/patchsets/mico/9999/001_all_nolibcheck.patch | 21 | ||||
-rw-r--r-- | src/patchsets/mico/9999/004_all_aix.patch | 22 | ||||
-rw-r--r-- | src/patchsets/mico/9999/006_all_as-needed.patch | 25 | ||||
-rw-r--r-- | src/patchsets/mico/9999/007_all_qt4-nothread.patch | 22 | ||||
-rw-r--r-- | src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch | 24 | ||||
-rw-r--r-- | src/patchsets/mico/9999/012_all_early-header-check.patch | 29 | ||||
-rw-r--r-- | src/patchsets/mico/9999/013_all_gtk-versions.patch | 143 | ||||
-rw-r--r-- | src/patchsets/mico/9999/014_all_idl-noresolve.patch | 40 | ||||
-rw-r--r-- | src/patchsets/mico/9999/015_all_gcc6.patch | 882 |
9 files changed, 325 insertions, 883 deletions
diff --git a/src/patchsets/mico/9999/001_all_nolibcheck.patch b/src/patchsets/mico/9999/001_all_nolibcheck.patch index 0cd5400adb..62dc16937a 100644 --- a/src/patchsets/mico/9999/001_all_nolibcheck.patch +++ b/src/patchsets/mico/9999/001_all_nolibcheck.patch @@ -1,10 +1,20 @@ -don't check for libbsd and libelf, they aren't needed anywhere +From db30b0b71225015826e830a3f678fdaae47272cc Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Tue, 21 May 2019 17:53:28 +0200 +Subject: [PATCH 05/19] drop needless checks for libbsd and libelf + +Don't check for libbsd and libelf, they aren't needed anywhere and may break copying binaries from one linux to another, when they did exist on the build-machine but not on the target. +--- + configure.in | 2 -- + 1 file changed, 2 deletions(-) ---- mico/configure.in -+++ mico/configure.in -@@ -1237,9 +1237,7 @@ +diff --git a/configure.in b/configure.in +index 0b0dc91..54ec42f 100644 +--- a/configure.in ++++ b/configure.in +@@ -1285,9 +1285,7 @@ HAVE_X11=$have_x AC_CHECK_LIB(socket, open) @@ -14,3 +24,6 @@ they did exist on the build-machine but not on the target. AC_CHECK_LIB(dl, open) AC_CHECK_LIB(dld, open) AC_CHECK_LIB(ld, open) +-- +2.19.2 + diff --git a/src/patchsets/mico/9999/004_all_aix.patch b/src/patchsets/mico/9999/004_all_aix.patch index fee2219063..8d6276a35a 100644 --- a/src/patchsets/mico/9999/004_all_aix.patch +++ b/src/patchsets/mico/9999/004_all_aix.patch @@ -1,7 +1,18 @@ -Do not add '-lstdc++' explicitly, this is c++ compiler's job. ---- mico/admin/mico-shld.aix.in -+++ mico/admin/mico-shld.aix.in -@@ -87,7 +87,7 @@ +From 172fbd747c527ac1829718ebeb46bf48df2cab8d Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Tue, 21 May 2019 17:55:22 +0200 +Subject: [PATCH 06/19] do not add '-lstdc++' explicitly on AIX + +Adding '-lstdc++' really is the C++ compiler's job. +--- + admin/mico-shld.aix.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/admin/mico-shld.aix.in b/admin/mico-shld.aix.in +index 483c24e..e0ce404 100755 +--- a/admin/mico-shld.aix.in ++++ b/admin/mico-shld.aix.in +@@ -87,7 +87,7 @@ eval "/usr/ccs/bin/nm $nmopts -h $ofiles" | sed -e '/:$/d' -e '/ U /d' -e '/_GLO ldcmd="@SHARED_CC@ @LDSOFLAGS@ @DLFLAGS@ $libdirs @LDFLAGS@ \ @@ -10,3 +21,6 @@ Do not add '-lstdc++' explicitly, this is c++ compiler's job. echo "$ldcmd" eval "$ldcmd" +-- +2.19.2 + diff --git a/src/patchsets/mico/9999/006_all_as-needed.patch b/src/patchsets/mico/9999/006_all_as-needed.patch index f99889f3bf..c115defc87 100644 --- a/src/patchsets/mico/9999/006_all_as-needed.patch +++ b/src/patchsets/mico/9999/006_all_as-needed.patch @@ -1,8 +1,20 @@ -Link libmico.so against configured libraries, -to get -Wl,--as-needed working. #280678. ---- mico/orb/Makefile -+++ mico/orb/Makefile -@@ -30,7 +30,7 @@ +From 076ba1ccc04b7478988bed0283c1dcf358d9d9a3 Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Tue, 21 May 2019 17:57:29 +0200 +Subject: [PATCH 07/19] link libmico.so against detected libraries + +Link shared libmico.so against configure detected libraries to avoid +undefined symbols, to let --as-needed linker flag work if forced. +See also: https://bugs.gentoo.org/280678 +--- + orb/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/orb/Makefile b/orb/Makefile +index 2bf0627..39e8e93 100644 +--- a/orb/Makefile ++++ b/orb/Makefile +@@ -30,7 +30,7 @@ CXXFLAGS := -DBUILD_MICO_DLL $(CXXFLAGS) endif endif @@ -11,3 +23,6 @@ to get -Wl,--as-needed working. #280678. ifeq ($(HAVE_CYGWIN), yes) ifeq ($(USE_CSL2), yes) PLATFORM_LIBS := $(PLATFORM_LIBS) -lssl -lcrypto +-- +2.19.2 + diff --git a/src/patchsets/mico/9999/007_all_qt4-nothread.patch b/src/patchsets/mico/9999/007_all_qt4-nothread.patch index 8449f79b87..cfe70c5bf0 100644 --- a/src/patchsets/mico/9999/007_all_qt4-nothread.patch +++ b/src/patchsets/mico/9999/007_all_qt4-nothread.patch @@ -1,7 +1,18 @@ -qt4 doesn't provide different libraries for threading. ---- mico/configure.in -+++ mico/configure.in -@@ -1124,7 +1124,7 @@ +From cc0fb5c2582183611d3b3472f8bfa37bf8c166be Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Tue, 21 May 2019 18:19:56 +0200 +Subject: [PATCH 08/19] qt4 doesn't provide different libraries with thread + support + +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 54ec42f..d2c939e 100644 +--- a/configure.in ++++ b/configure.in +@@ -1158,7 +1158,7 @@ if test X"$QTDIR" != X; then AC_MSG_WARN(cannot find moc. QT parts disabled.) HAVE_QT=no fi @@ -10,3 +21,6 @@ qt4 doesn't provide different libraries for threading. AC_CHECK_LIB(qt-mt, open, qt_mt=yes, qt_mt=no) if test X"$qt_mt" = Xno; then AC_MSG_WARN(cannot find multi-threaded version of QT library. QT parts disabled.) +-- +2.19.2 + diff --git a/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch b/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch index e5abf931b4..be10207fcf 100644 --- a/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch +++ b/src/patchsets/mico/9999/008_all_drop-pgsql-header-check.patch @@ -1,10 +1,19 @@ -http://bugs.gentoo.org/show_bug.cgi?id=306255 +From 1eee3d7bac76537c09c407e67771c9a692223f29 Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Tue, 21 May 2019 18:22:39 +0200 +Subject: [PATCH 09/19] drop check for pgsql/libpq-fe.h, not used anywhere -Result of 'checking for pgsql/libpq-fe.h' is not used anywhere, just drop it. ---- mico/configure.in -+++ mico/configure.in -@@ -1324,7 +1324,7 @@ - AC_CHECK_HEADERS(netinet/tcp.h stdlib.h sys/time.h sunmath.h sys/stat.h) +See also: https://bugs.gentoo.org/306255 +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index d2c939e..20112bb 100644 +--- a/configure.in ++++ b/configure.in +@@ -1385,7 +1385,7 @@ AC_CHECK_HEADERS(sys/un.h netinet/in.h arpa/inet.h netdb.h dlfcn.h dl.h) + AC_CHECK_HEADERS(netinet/tcp.h stdlib.h sys/time.h sys/timeb.h sunmath.h sys/stat.h) AC_CHECK_HEADERS(poll.h) -AC_CHECK_HEADERS(exception exception.h terminate.h openssl/ssl.h pgsql/libpq-fe.h) @@ -12,3 +21,6 @@ Result of 'checking for pgsql/libpq-fe.h' is not used anywhere, just drop it. # QT AC_CHECK_HEADERS(qapplication.h qsocketnotifier.h qlineedit.h) +-- +2.19.2 + diff --git a/src/patchsets/mico/9999/012_all_early-header-check.patch b/src/patchsets/mico/9999/012_all_early-header-check.patch index 1e814fa57b..3efa25a7b2 100644 --- a/src/patchsets/mico/9999/012_all_early-header-check.patch +++ b/src/patchsets/mico/9999/012_all_early-header-check.patch @@ -1,10 +1,20 @@ -The first header-check resolves AC_REQUIRE(AC_PROG_EGREP). If that is not -run due to some condition, EGREP is unset for subsequent checks. -This breaks the checks for function prototypes. +From cef3d991c5c19933f383706f812f29bb89f393eb Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Tue, 21 May 2019 18:32:09 +0200 +Subject: [PATCH 11/19] run AC_HEADER_STDC check early ---- mico/configure.in -+++ mico/configure.in -@@ -411,6 +411,8 @@ +The first header-check resolves AC_REQUIRE(AC_PROG_EGREP). If that is +not run due to some condition, EGREP is unset for subsequent checks, +breaking the checks for function prototypes. +--- + configure.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.in b/configure.in +index 6cdadb4..849ea35 100644 +--- a/configure.in ++++ b/configure.in +@@ -411,6 +411,8 @@ ac_link="$ac_link "'$EXTRA_LIBS' AC_SUBST(EXTRA_CXXFLAGS) ac_compile="$ac_compile "'$EXTRA_CXXFLAGS' @@ -13,11 +23,14 @@ This breaks the checks for function prototypes. # # thread support # -@@ -1342,7 +1344,6 @@ +@@ -1385,7 +1387,6 @@ CURSES_LIBS="$LIBS $SHLIBS" # Checks for header files. # -AC_HEADER_STDC AC_CHECK_HEADERS(fcntl.h unistd.h sys/select.h strings.h float.h ieeefp.h) AC_CHECK_HEADERS(sys/un.h netinet/in.h arpa/inet.h netdb.h dlfcn.h dl.h) - AC_CHECK_HEADERS(netinet/tcp.h stdlib.h sys/time.h sunmath.h sys/stat.h) + AC_CHECK_HEADERS(netinet/tcp.h stdlib.h sys/time.h sys/timeb.h sunmath.h sys/stat.h) +-- +2.19.2 + diff --git a/src/patchsets/mico/9999/013_all_gtk-versions.patch b/src/patchsets/mico/9999/013_all_gtk-versions.patch index e795800d4d..26997089b7 100644 --- a/src/patchsets/mico/9999/013_all_gtk-versions.patch +++ b/src/patchsets/mico/9999/013_all_gtk-versions.patch @@ -1,54 +1,18 @@ ---- mico/configure.in -+++ mico/configure.in -@@ -152,8 +152,8 @@ - QTDIR=$withval, QTDIR="") - - AC_ARG_WITH(gtk, -- [ --with-gtk=gtkdir use GTK installed in gtkdir], -- GTKDIR=$withval, GTKDIR="") -+ [ --with-gtk=gtk-major use GTK major version, either 1, 2 or 3], -+ , with_gtk="no") - - AC_ARG_WITH(tcl, - [ --with-tcl=tcldir use TCL installed in tcldir], -@@ -1156,16 +1156,28 @@ - fi - - -+HAVE_GTK=no - AC_SUBST(HAVE_GTK) - --if test X"$GTKDIR" != X; then -- AM_PATH_GTK(,HAVE_GTK=yes, -- AC_MSG_WARN(cannot find gtk-config. GTK parts disabled) -- HAVE_GTK=no) --else -- HAVE_GTK=no -+if test "X$with_gtk" = Xyes -o "X$with_gtk" = X3; then -+ AC_LANG_C -+ AM_PATH_GTK_3_0(,HAVE_GTK=yes; with_gtk=3) -+ AC_LANG_CPLUSPLUS -+fi -+ -+if test "X$with_gtk" = Xyes -o "X$with_gtk" = X2; then -+ AC_LANG_C -+ AM_PATH_GTK_2_0(,HAVE_GTK=yes; with_gtk=2) -+ AC_LANG_CPLUSPLUS - fi - -+if test "X$with_gtk" = Xyes -o "X$with_gtk" = X1; then -+ AM_PATH_GTK(,HAVE_GTK=yes; with_gtk=1) -+fi -+ -+if test "X$with_gtk" != Xno && test "X$HAVE_GTK" = Xno; then -+ AC_MSG_WARN(cannot find any GTK+ version, GTK parts disabled) -+fi - - AC_SUBST(HAVE_TCL) - AC_SUBST(TCL_LIBS) ---- mico/aclocal.m4 -+++ mico/aclocal.m4 -@@ -878,3 +878,422 @@ +From 16e9586b3630174f8c27579dca9b974022110838 Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Tue, 21 May 2019 18:37:25 +0200 +Subject: [PATCH 12/19] check for gtk-3, gtk-2, gtk-1 in order + +--- + aclocal.m4 | 419 +++++++++++++++++++++++++++++++++++++++++++++++++++ + configure.in | 28 +++- + 2 files changed, 439 insertions(+), 8 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 485fcbf..c10653e 100644 +--- a/aclocal.m4 ++++ b/aclocal.m4 +@@ -878,3 +878,422 @@ main () AC_SUBST(GTK_LIBS) rm -f conf.gtktest ]) @@ -58,11 +22,11 @@ +# Owen Taylor 1997-2001 + +dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, ++dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, +dnl pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GTK_2_0], -+[dnl ++[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], @@ -72,7 +36,7 @@ + for module in . $4 + do + case "$module" in -+ gthread) ++ gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + esac @@ -135,7 +99,7 @@ +#include <stdio.h> +#include <stdlib.h> + -+int ++int +main () +{ + int major, minor, micro; @@ -154,7 +118,7 @@ + (gtk_minor_version != $gtk_config_minor_version) || + (gtk_micro_version != $gtk_config_micro_version)) + { -+ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", ++ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); @@ -164,7 +128,7 @@ + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); -+ } ++ } + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) @@ -208,7 +172,7 @@ + fi + if test "x$no_gtk" = x ; then + AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) -+ ifelse([$2], , :, [$2]) ++ ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then @@ -256,11 +220,11 @@ +# Owen Taylor 1997-2001 + +dnl AM_PATH_GTK_3_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, ++dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, +dnl pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GTK_3_0], -+[dnl ++[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], @@ -333,7 +297,7 @@ +#include <stdio.h> +#include <stdlib.h> + -+int ++int +main () +{ + int major, minor, micro; @@ -352,7 +316,7 @@ + (gtk_minor_version != $gtk_config_minor_version) || + (gtk_micro_version != $gtk_config_micro_version)) + { -+ printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", ++ printf("\n*** 'pkg-config --modversion gtk+-3.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", + $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, + gtk_major_version, gtk_minor_version, gtk_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); @@ -362,7 +326,7 @@ + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); -+ } ++ } + else if ((gtk_major_version != GTK_MAJOR_VERSION) || + (gtk_minor_version != GTK_MINOR_VERSION) || + (gtk_micro_version != GTK_MICRO_VERSION)) @@ -471,3 +435,56 @@ + ifelse([$3],,[:],[$3]) + fi +]) +diff --git a/configure.in b/configure.in +index 849ea35..727a51f 100644 +--- a/configure.in ++++ b/configure.in +@@ -152,8 +152,8 @@ AC_ARG_WITH(qt, + QTDIR=$withval, QTDIR="") + + AC_ARG_WITH(gtk, +- [ --with-gtk=gtkdir use GTK installed in gtkdir], +- GTKDIR=$withval, GTKDIR="") ++ [ --with-gtk=gtk-major use GTK major version, either 1, 2 or 3], ++ , with_gtk="no") + + AC_ARG_WITH(tcl, + [ --with-tcl=tcldir use TCL installed in tcldir], +@@ -1180,16 +1180,28 @@ else + fi + + ++HAVE_GTK=no + AC_SUBST(HAVE_GTK) + +-if test X"$GTKDIR" != X; then +- AM_PATH_GTK(,HAVE_GTK=yes, +- AC_MSG_WARN(cannot find gtk-config. GTK parts disabled) +- HAVE_GTK=no) +-else +- HAVE_GTK=no ++if test "X$with_gtk" = Xyes -o "X$with_gtk" = X3; then ++ AC_LANG_C ++ AM_PATH_GTK_3_0(,HAVE_GTK=yes; with_gtk=3) ++ AC_LANG_CPLUSPLUS ++fi ++ ++if test "X$with_gtk" = Xyes -o "X$with_gtk" = X2; then ++ AC_LANG_C ++ AM_PATH_GTK_2_0(,HAVE_GTK=yes; with_gtk=2) ++ AC_LANG_CPLUSPLUS + fi + ++if test "X$with_gtk" = Xyes -o "X$with_gtk" = X1; then ++ AM_PATH_GTK(,HAVE_GTK=yes; with_gtk=1) ++fi ++ ++if test "X$with_gtk" != Xno && test "X$HAVE_GTK" = Xno; then ++ AC_MSG_WARN(cannot find any GTK+ version, GTK parts disabled) ++fi + + AC_SUBST(HAVE_TCL) + AC_SUBST(TCL_LIBS) +-- +2.19.2 + diff --git a/src/patchsets/mico/9999/014_all_idl-noresolve.patch b/src/patchsets/mico/9999/014_all_idl-noresolve.patch index 2cec54ed75..34685b942b 100644 --- a/src/patchsets/mico/9999/014_all_idl-noresolve.patch +++ b/src/patchsets/mico/9999/014_all_idl-noresolve.patch @@ -1,6 +1,18 @@ ---- mico/idl/main.cc -+++ mico/idl/main.cc 2011-11-25 23:52:43.149752575 +0100 -@@ -82,6 +82,13 @@ +From 7ade2254048dccfde13846c3e0a13b7f5acbef36 Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Tue, 21 May 2019 18:41:09 +0200 +Subject: [PATCH 13/19] no need for working DNS in idl compiler + +--- + idl/main.cc | 7 +++++++ + orb/address.cc | 7 +++++-- + 2 files changed, 12 insertions(+), 2 deletions(-) + +diff --git a/idl/main.cc b/idl/main.cc +index a2ad803..61dcdaa 100644 +--- a/idl/main.cc ++++ b/idl/main.cc +@@ -75,6 +75,13 @@ int main( int argc, char *argv[] ) DB db; // ORB initialization @@ -14,18 +26,24 @@ CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); #ifdef _WIN32 ---- mico/orb/address.cc -+++ mico/orb/address.cc -@@ -635,8 +635,12 @@ +diff --git a/orb/address.cc b/orb/address.cc +index 05ddf8b..e762e46 100644 +--- a/orb/address.cc ++++ b/orb/address.cc +@@ -635,8 +635,11 @@ MICO::InetAddress::hostname () { if (hname.length() == 0) { char buf[200]; +- int r = gethostname (buf, 200); +- assert (r == 0); + if (_resolve) { - int r = gethostname (buf, 200); - assert (r == 0); -+ } else { -+ strcpy(buf, "localhost"); -+ } ++ int r = gethostname (buf, 200); ++ assert (r == 0); ++ } else ++ strcpy(buf, "localhost"); /* * some OSes do not return an FQDN. So we get the ip address for the * hostname and resolve that address into the FQDN... +-- +2.19.2 + diff --git a/src/patchsets/mico/9999/015_all_gcc6.patch b/src/patchsets/mico/9999/015_all_gcc6.patch index 3885ef2e32..58e43d47eb 100644 --- a/src/patchsets/mico/9999/015_all_gcc6.patch +++ b/src/patchsets/mico/9999/015_all_gcc6.patch @@ -1,6 +1,20 @@ +From e12823e39323ddd75c76b6c1daa1689094a02ae6 Mon Sep 17 00:00:00 2001 +From: Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> +Date: Wed, 22 May 2019 09:55:25 +0200 +Subject: [PATCH 14/19] fix compilation with gcc-6 + +--- + idl/idlparser.cc | 6 +++--- + idl/yacc.cc | 6 +++--- + orb/uni_conversion.h | 4 ++-- + orb/uni_fromuni.cc | 18 +++++++++--------- + 4 files changed, 17 insertions(+), 17 deletions(-) + +diff --git a/idl/idlparser.cc b/idl/idlparser.cc +index 63c6345..400bc76 100644 --- a/idl/idlparser.cc +++ b/idl/idlparser.cc -@@ -395,7 +395,7 @@ +@@ -395,7 +395,7 @@ IDLParser::collectImport (CORBA::Container_ptr con, ParseNode *node) node = node->getBranch (1); assert (node); @@ -9,7 +23,7 @@ node->getType() == scoped_name); CORBA::String_var to_be_imported = CORBA::string_dup (node->getIdent ()); -@@ -427,7 +427,7 @@ +@@ -427,7 +427,7 @@ IDLParser::collectImport (CORBA::Container_ptr con, ParseNode *node) CORBA::Contained_var icont = CORBA::Contained::_nil (); @@ -18,7 +32,7 @@ if (CORBA::is_nil (myrepo)) { cerr << IDLError (36, node, to_be_imported.in()) << endl; exit (1); -@@ -1823,7 +1823,7 @@ +@@ -1823,7 +1823,7 @@ void IDLParser::collectContextExpr( ParseNode *node, CORBA::ContextIdSeq &ctx ) { while( node != NULL ) { @@ -27,9 +41,11 @@ int i = ctx.length(); ctx.length( i + 1 ); ctx[ i ] = (const char *) node->getIdent(); +diff --git a/idl/yacc.cc b/idl/yacc.cc +index aacb293..579e53c 100644 --- a/idl/yacc.cc +++ b/idl/yacc.cc -@@ -3639,7 +3639,7 @@ +@@ -3639,7 +3639,7 @@ yyreduce: case 251: #line 1792 "yacc.yy" { @@ -38,7 +54,7 @@ yyval.node->setIdent( yyvsp[0]._str ); } break; -@@ -3647,7 +3647,7 @@ +@@ -3647,7 +3647,7 @@ yyreduce: case 252: #line 1797 "yacc.yy" { @@ -47,7 +63,7 @@ yyval.node->setIdent( yyvsp[-2]._str ); } break; -@@ -3774,7 +3774,7 @@ +@@ -3774,7 +3774,7 @@ yyreduce: case 267: #line 1919 "yacc.yy" { @@ -56,803 +72,113 @@ yyval.node->setIdent (yyvsp[0]._str); } break; +diff --git a/orb/uni_conversion.h b/orb/uni_conversion.h +index 8cee7bf..364066e 100644 +--- a/orb/uni_conversion.h ++++ b/orb/uni_conversion.h +@@ -38,7 +38,7 @@ typedef struct + typedef struct + { + uni_ushort unicode; +- char code; ++ unsigned char code; + }cexcept; + + typedef struct +@@ -50,7 +50,7 @@ typedef struct + + typedef struct + { +- const char *array; ++ const unsigned char *array; + uni_ushort offset; + uni_ubyte size; + bits32 transMask; +diff --git a/orb/uni_fromuni.cc b/orb/uni_fromuni.cc +index 4549015..adfcbac 100644 --- a/orb/uni_fromuni.cc +++ b/orb/uni_fromuni.cc -@@ -51,18 +51,18 @@ +@@ -50,7 +50,7 @@ + static char FindException(const cexcept *array, uni_ubyte arrlen, + register uni_ushort unicode); - static const char uni2ebcArray[] = /* beginning with 0x20 (32) */ +-static const char uni2ebcArray[] = /* beginning with 0x20 (32) */ ++static const unsigned char uni2ebcArray[] = /* beginning with 0x20 (32) */ { -- 0x40, 0x5A, 0x7E, 0x7B, 0x5B, 0x6C, 0x50, 0x7D, /* 0x20-0x27 ( 32- 39) */ -- 0x4D, 0x5D, 0x5C, 0x4E, 0x6B, 0x6D, 0x4B, 0x61, /* 0x28-0x2F ( 40- 47) */ -- 0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, /* 0x30-0x37 ( 48- 55) */ -- 0xF8, 0xF9, 0x7A, 0x5E, 0x4C, 0x7E, 0x6E, 0x6F, /* 0x38-0x3F ( 56- 63) */ -- 0x7C, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, /* 0x40-0x47 ( 64- 71) */ -- 0xC8, 0xC9, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, /* 0x48-0x4F ( 72- 79) */ -- 0xD7, 0xD8, 0xD9, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, /* 0x50-0x57 ( 80- 87) */ -- 0xE7, 0xE8, 0xE9, '\0', '\0', '\0', '\0', 0x6D, /* 0x58-0x5F ( 88- 95) */ -- '\0', 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, /* 0x60-0x67 ( 96-103) */ -- 0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, /* 0x68-0x6F (104-111) */ -- 0x97, 0x98, 0x99, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, /* 0x70-0x77 (112-119) */ -- 0xA7, 0xA8, 0xA9, 0x8B, 0x6A, 0x9B, '\0', '\0' /* 0x78-0x7F (120-127) */ -+ (char)0x40, (char)0x5A, (char)0x7E, (char)0x7B, (char)0x5B, (char)0x6C, (char)0x50, (char)0x7D, /* 0x20-0x27 ( 32- 39) */ -+ (char)0x4D, (char)0x5D, (char)0x5C, (char)0x4E, (char)0x6B, (char)0x6D, (char)0x4B, (char)0x61, /* 0x28-0x2F ( 40- 47) */ -+ (char)0xF0, (char)0xF1, (char)0xF2, (char)0xF3, (char)0xF4, (char)0xF5, (char)0xF6, (char)0xF7, /* 0x30-0x37 ( 48- 55) */ -+ (char)0xF8, (char)0xF9, (char)0x7A, (char)0x5E, (char)0x4C, (char)0x7E, (char)0x6E, (char)0x6F, /* 0x38-0x3F ( 56- 63) */ -+ (char)0x7C, (char)0xC1, (char)0xC2, (char)0xC3, (char)0xC4, (char)0xC5, (char)0xC6, (char)0xC7, /* 0x40-0x47 ( 64- 71) */ -+ (char)0xC8, (char)0xC9, (char)0xD1, (char)0xD2, (char)0xD3, (char)0xD4, (char)0xD5, (char)0xD6, /* 0x48-0x4F ( 72- 79) */ -+ (char)0xD7, (char)0xD8, (char)0xD9, (char)0xE2, (char)0xE3, (char)0xE4, (char)0xE5, (char)0xE6, /* 0x50-0x57 ( 80- 87) */ -+ (char)0xE7, (char)0xE8, (char)0xE9, (char)'\0', (char)'\0', (char)'\0', (char)'\0', (char)0x6D, /* 0x58-0x5F ( 88- 95) */ -+ (char)'\0', (char)0x81, (char)0x82, (char)0x83, (char)0x84, (char)0x85, (char)0x86, (char)0x87, /* 0x60-0x67 ( 96-103) */ -+ (char)0x88, (char)0x89, (char)0x91, (char)0x92, (char)0x93, (char)0x94, (char)0x95, (char)0x96, /* 0x68-0x6F (104-111) */ -+ (char)0x97, (char)0x98, (char)0x99, (char)0xA2, (char)0xA3, (char)0xA4, (char)0xA5, (char)0xA6, /* 0x70-0x77 (112-119) */ -+ (char)0xA7, (char)0xA8, (char)0xA9, (char)0x8B, (char)0x6A, (char)0x9B, (char)'\0', (char)'\0' /* 0x78-0x7F (120-127) */ + 0x40, 0x5A, 0x7E, 0x7B, 0x5B, 0x6C, 0x50, 0x7D, /* 0x20-0x27 ( 32- 39) */ + 0x4D, 0x5D, 0x5C, 0x4E, 0x6B, 0x6D, 0x4B, 0x61, /* 0x28-0x2F ( 40- 47) */ +@@ -112,7 +112,7 @@ static const uni_ubyte uni2htmlArray[] = /* beginning with 0xa0 (160) */ + ** 0x2014 (unicode) => "mdash" (HTML) (em dash) */ }; - // static const cexcept exc2ebcArray[] = -@@ -113,434 +113,434 @@ - - static const char uni2macArray[] = /* beginning with 0xA0 (160) */ - { -- 0xCA, 0xC1, 0xA2, 0xA3, /* 0xA0-0xA3 (160-163) */ -- 0xDB, 0xB4, '\0', 0xA4, /* 0xA4-0xA7 (164-167) */ -- 0xAC, 0xA9, 0xAB, 0xC7, /* 0xA8-0xAB (168-171) */ -- 0xC2, 0xD0, 0xA8, '\0', /* 0xAC-0xAF (172-175) */ -- -- 0xA1, 0xB1, '\0', '\0', /* 0xB0-0xB3 (176-179) */ -- 0xAB, 0xB5, 0xA6, 0xE1, /* 0xB4-0xB7 (180-183) */ -- '\0', 0xF5, 0xAC, 0xC8, /* 0xB8-0xBB (184-187) */ -- '\0', '\0', '\0', 0xC0, /* 0xBC-0xBF (188-191) */ -- -- 0xCB, 0xE7, 0xE5, 0xCC, /* 0xC0-0xC3 (192-195) */ -- 0x80, 0x81, 0xA6, 0x82, /* 0xC4-0xC7 (196-199) */ -- 0xE9, 0x83, 0xE6, 0xE8, /* 0xC8-0xCB (200-203) */ -- 0xCD, 0xCA, 0xCB, 0xCC, /* 0xCC-0xCF (204-207) */ -- -- '\0', 0x84, 0xF1, 0xCE, /* 0xD0-0xD3 (208-211) */ -- 0xCF, 0xCD, 0x85, '\0', /* 0xD4-0xD7 (212-215) */ -- 0xAF, 0xF5, 0xF3, 0xF4, /* 0xD8-0xDB (216-219) */ -- 0x86, '\0', '\0', 0xA7, /* 0xDC-0xDF (220-223) */ -- -- 0x88, 0x87, 0x89, 0x8B, /* 0xE0-0xE3 (224-227) */ -- 0x8A, 0x8C, 0xBE, 0x8D, /* 0xE4-0xE7 (228-231) */ -- 0x8F, 0x8E, 0x90, 0x91, /* 0xE8-0xEB (232-235) */ -- 0x93, 0x92, 0x94, 0x95, /* 0xEC-0xEF (236-239) */ -- -- '\0', 0x96, 0x98, 0x97, /* 0xF0-0xF3 (240-243) */ -- 0x99, 0x9B, 0x9A, 0xD6, /* 0xF4-0xF7 (244-247) */ -- 0xBF, 0x9D, 0x9C, 0x9E, /* 0xF8-0xFB (248-251) */ -- 0x9F, '\0', '\0', 0xD8 /* 0xFC-0xFF (252-255) */ -+ (char)0xCA, (char)0xC1, (char)0xA2, (char)0xA3, /* 0xA0-0xA3 (160-163) */ -+ (char)0xDB, (char)0xB4, (char)'\0', (char)0xA4, /* 0xA4-0xA7 (164-167) */ -+ (char)0xAC, (char)0xA9, (char)0xAB, (char)0xC7, /* 0xA8-0xAB (168-171) */ -+ (char)0xC2, (char)0xD0, (char)0xA8, (char)'\0', /* 0xAC-0xAF (172-175) */ -+ -+ (char)0xA1, (char)0xB1, (char)'\0', (char)'\0', /* 0xB0-0xB3 (176-179) */ -+ (char)0xAB, (char)0xB5, (char)0xA6, (char)0xE1, /* 0xB4-0xB7 (180-183) */ -+ (char)'\0', (char)0xF5, (char)0xAC, (char)0xC8, /* 0xB8-0xBB (184-187) */ -+ (char)'\0', (char)'\0', (char)'\0', (char)0xC0, /* 0xBC-0xBF (188-191) */ -+ -+ (char)0xCB, (char)0xE7, (char)0xE5, (char)0xCC, /* 0xC0-0xC3 (192-195) */ -+ (char)0x80, (char)0x81, (char)0xA6, (char)0x82, /* 0xC4-0xC7 (196-199) */ -+ (char)0xE9, (char)0x83, (char)0xE6, (char)0xE8, /* 0xC8-0xCB (200-203) */ -+ (char)0xCD, (char)0xCA, (char)0xCB, (char)0xCC, /* 0xCC-0xCF (204-207) */ -+ -+ (char)'\0', (char)0x84, (char)0xF1, (char)0xCE, /* 0xD0-0xD3 (208-211) */ -+ (char)0xCF, (char)0xCD, (char)0x85, (char)'\0', /* 0xD4-0xD7 (212-215) */ -+ (char)0xAF, (char)0xF5, (char)0xF3, (char)0xF4, /* 0xD8-0xDB (216-219) */ -+ (char)0x86, (char)'\0', (char)'\0', (char)0xA7, /* 0xDC-0xDF (220-223) */ -+ -+ (char)0x88, (char)0x87, (char)0x89, (char)0x8B, /* 0xE0-0xE3 (224-227) */ -+ (char)0x8A, (char)0x8C, (char)0xBE, (char)0x8D, /* 0xE4-0xE7 (228-231) */ -+ (char)0x8F, (char)0x8E, (char)0x90, (char)0x91, /* 0xE8-0xEB (232-235) */ -+ (char)0x93, (char)0x92, (char)0x94, (char)0x95, /* 0xEC-0xEF (236-239) */ -+ -+ (char)'\0', (char)0x96, (char)0x98, (char)0x97, /* 0xF0-0xF3 (240-243) */ -+ (char)0x99, (char)0x9B, (char)0x9A, (char)0xD6, /* 0xF4-0xF7 (244-247) */ -+ (char)0xBF, (char)0x9D, (char)0x9C, (char)0x9E, /* 0xF8-0xFB (248-251) */ -+ (char)0x9F, (char)'\0', (char)'\0', (char)0xD8 /* 0xFC-0xFF (252-255) */ - }; - - static const cexcept exc2macArray[] = - { -- { 0x0152 , 0xCE } , { 0x0153 , 0xCF } , { 0x0178 , 0xD9 } , -- { 0x0192 , 0xC4 } , { 0x02C6 , 0xF6 } , { 0x02C7 , 0xF9 } , -- { 0x02C9 , 0xF8 } , { 0x02CE , 0xFE } , { 0x02D8 , 0xFF } , -- { 0x02D9 , 0xFA } , { 0x02DA , 0xFB } , { 0x02DB , 0xFC } , -- { 0x02DC , 0xF7 } , { 0x03A9 , 0xBD } , { 0x03C0 , 0xB9 } , -- { 0x2013 , 0xD0 } , { 0x2014 , 0xD1 } , { 0x2018 , 0xD4 } , -- { 0x2019 , 0xD5 } , { 0x201A , 0xE2 } , { 0x201C , 0xD2 } , -- { 0x201D , 0xD3 } , { 0x201E , 0xE3 } , { 0x2020 , 0xA0 } , -- { 0x2021 , 0xE0 } , { 0x2026 , 0xC9 } , { 0x2031 , 0xE4 } , -- { 0x2039 , 0xDC } , { 0x20A0 , 0xDD } , { 0x2122 , 0xAA } , -- { 0x2190 , 0x1C } , { 0x2191 , 0x1E } , { 0x2192 , 0x1D } , -- { 0x2193 , 0x1F } , { 0x2202 , 0xB6 } , { 0x2205 , 0xD7 } , -- { 0x2206 , 0xC6 } , { 0x220E , 0xA5 } , { 0x220F , 0xB8 } , -- { 0x2211 , 0xB7 } , { 0x2215 , 0xDA } , { 0x221A , 0xC3 } , -- { 0x221E , 0xB0 } , { 0x222B , 0xBA } , { 0x2248 , 0xC5 } , -- { 0x2260 , 0xAD } , { 0x2264 , 0xB2 } , { 0x2265 , 0xB3 } , -- { 0xFB01 , 0xDE } , { 0xFB02 , 0xDF } -+ { (uni_ushort)0x0152 , (char)0xCE } , { (uni_ushort)0x0153 , (char)0xCF } , { (uni_ushort)0x0178 , (char)0xD9 } , -+ { (uni_ushort)0x0192 , (char)0xC4 } , { (uni_ushort)0x02C6 , (char)0xF6 } , { (uni_ushort)0x02C7 , (char)0xF9 } , -+ { (uni_ushort)0x02C9 , (char)0xF8 } , { (uni_ushort)0x02CE , (char)0xFE } , { (uni_ushort)0x02D8 , (char)0xFF } , -+ { (uni_ushort)0x02D9 , (char)0xFA } , { (uni_ushort)0x02DA , (char)0xFB } , { (uni_ushort)0x02DB , (char)0xFC } , -+ { (uni_ushort)0x02DC , (char)0xF7 } , { (uni_ushort)0x03A9 , (char)0xBD } , { (uni_ushort)0x03C0 , (char)0xB9 } , -+ { (uni_ushort)0x2013 , (char)0xD0 } , { (uni_ushort)0x2014 , (char)0xD1 } , { (uni_ushort)0x2018 , (char)0xD4 } , -+ { (uni_ushort)0x2019 , (char)0xD5 } , { (uni_ushort)0x201A , (char)0xE2 } , { (uni_ushort)0x201C , (char)0xD2 } , -+ { (uni_ushort)0x201D , (char)0xD3 } , { (uni_ushort)0x201E , (char)0xE3 } , { (uni_ushort)0x2020 , (char)0xA0 } , -+ { (uni_ushort)0x2021 , (char)0xE0 } , { (uni_ushort)0x2026 , (char)0xC9 } , { (uni_ushort)0x2031 , (char)0xE4 } , -+ { (uni_ushort)0x2039 , (char)0xDC } , { (uni_ushort)0x20A0 , (char)0xDD } , { (uni_ushort)0x2122 , (char)0xAA } , -+ { (uni_ushort)0x2190 , (char)0x1C } , { (uni_ushort)0x2191 , (char)0x1E } , { (uni_ushort)0x2192 , (char)0x1D } , -+ { (uni_ushort)0x2193 , (char)0x1F } , { (uni_ushort)0x2202 , (char)0xB6 } , { (uni_ushort)0x2205 , (char)0xD7 } , -+ { (uni_ushort)0x2206 , (char)0xC6 } , { (uni_ushort)0x220E , (char)0xA5 } , { (uni_ushort)0x220F , (char)0xB8 } , -+ { (uni_ushort)0x2211 , (char)0xB7 } , { (uni_ushort)0x2215 , (char)0xDA } , { (uni_ushort)0x221A , (char)0xC3 } , -+ { (uni_ushort)0x221E , (char)0xB0 } , { (uni_ushort)0x222B , (char)0xBA } , { (uni_ushort)0x2248 , (char)0xC5 } , -+ { (uni_ushort)0x2260 , (char)0xAD } , { (uni_ushort)0x2264 , (char)0xB2 } , { (uni_ushort)0x2265 , (char)0xB3 } , -+ { (uni_ushort)0xFB01 , (char)0xDE } , { (uni_ushort)0xFB02 , (char)0xDF } - }; - - static const char uni2koiArray1[] = /* beginning with 0x0410 (1040) */ - { -- 0xE1, 0xE2, 0xF7, 0xE7, /* 0x0410-0x0413 (1040-1043) */ -- 0xE4, 0xE5, 0xF6, 0xFA, /* 0x0414-0x0417 (1044-1047) */ -- 0xE9, 0xEA, 0xEB, 0xEC, /* 0x0418-0x041B (1048-1051) */ -- 0xED, 0xEE, 0xEF, 0xF0, /* 0x041C-0x041F (1042-1055) */ -- -- 0xF2, 0xF3, 0xF4, 0xF5, /* 0x0420-0x0423 (1056-1059) */ -- 0xE6, 0xE8, 0xE3, 0xFE, /* 0x0424-0x0427 (1060-1063) */ -- 0xFB, 0xFD, 0xFF, 0xF9, /* 0x0428-0x042B (1064-1067) */ -- 0xF8, 0xFC, 0xE0, 0xF1, /* 0x042C-0x042F (1068-1071) */ -- -- 0xC1, 0xC2, 0xD7, 0xC7, /* 0x0430-0x0433 (1072-1075) */ -- 0xC4, 0xC5, 0xD6, 0xDA, /* 0x0434-0x0437 (1076-1079) */ -- 0xC9, 0xCA, 0xCB, 0xCC, /* 0x0438-0x043B (1080-1083) */ -- 0xCD, 0xCE, 0xCF, 0xD0, /* 0x043C-0x043F (1084-1087) */ -- -- 0xD2, 0xD3, 0xD4, 0xD5, /* 0x0440-0x0443 (1088-1091) */ -- 0xC6, 0xC8, 0xC3, 0xDE, /* 0x0444-0x0447 (1092-1095) */ -- 0xDB, 0xDD, 0xDF, 0xD9, /* 0x0448-0x044B (1096-1099) */ -- 0xD8, 0xDC, 0xC0, 0xD1 /* 0x044C-0x044F (1100-1103) */ -+ (char)0xE1, (char)0xE2, (char)0xF7, (char)0xE7, /* 0x0410-0x0413 (1040-1043) */ -+ (char)0xE4, (char)0xE5, (char)0xF6, (char)0xFA, /* 0x0414-0x0417 (1044-1047) */ -+ (char)0xE9, (char)0xEA, (char)0xEB, (char)0xEC, /* 0x0418-0x041B (1048-1051) */ -+ (char)0xED, (char)0xEE, (char)0xEF, (char)0xF0, /* 0x041C-0x041F (1042-1055) */ -+ -+ (char)0xF2, (char)0xF3, (char)0xF4, (char)0xF5, /* 0x0420-0x0423 (1056-1059) */ -+ (char)0xE6, (char)0xE8, (char)0xE3, (char)0xFE, /* 0x0424-0x0427 (1060-1063) */ -+ (char)0xFB, (char)0xFD, (char)0xFF, (char)0xF9, /* 0x0428-0x042B (1064-1067) */ -+ (char)0xF8, (char)0xFC, (char)0xE0, (char)0xF1, /* 0x042C-0x042F (1068-1071) */ -+ -+ (char)0xC1, (char)0xC2, (char)0xD7, (char)0xC7, /* 0x0430-0x0433 (1072-1075) */ -+ (char)0xC4, (char)0xC5, (char)0xD6, (char)0xDA, /* 0x0434-0x0437 (1076-1079) */ -+ (char)0xC9, (char)0xCA, (char)0xCB, (char)0xCC, /* 0x0438-0x043B (1080-1083) */ -+ (char)0xCD, (char)0xCE, (char)0xCF, (char)0xD0, /* 0x043C-0x043F (1084-1087) */ -+ -+ (char)0xD2, (char)0xD3, (char)0xD4, (char)0xD5, /* 0x0440-0x0443 (1088-1091) */ -+ (char)0xC6, (char)0xC8, (char)0xC3, (char)0xDE, /* 0x0444-0x0447 (1092-1095) */ -+ (char)0xDB, (char)0xDD, (char)0xDF, (char)0xD9, /* 0x0448-0x044B (1096-1099) */ -+ (char)0xD8, (char)0xDC, (char)0xC0, (char)0xD1 /* 0x044C-0x044F (1100-1103) */ - }; - - static const char uni2koiArray2[] = /* beginning with 0x2550 (9552) */ - { -- 0xA0, 0xA1, 0xA2, 0xA4, /* 0x0250-0x0253 (9552-9555) */ -- 0xA5, 0xA6, 0xA7, 0xA8, /* 0x0254-0x0257 (9556-9559) */ -- 0xA9, 0xAA, 0xAB, 0xAC, /* 0x0258-0x025B (9560-9563) */ -- 0xAD, 0xAE, 0xAF, 0xB0, /* 0x025C-0x025F (9564-9567) */ -- -- 0xB1, 0xB2, 0xB4, 0xB5, /* 0x0260-0x0263 (9568-9571) */ -- 0xB6, 0xB7, 0xB8, 0xB9, /* 0x0264-0x0267 (9572-9575) */ -- 0xBA, 0xBB, 0xBC, 0xBD, /* 0x0268-0x026B (9576-9579) */ -- 0xBE /* 0x026C (9578 ) */ -+ (char)0xA0, (char)0xA1, (char)0xA2, (char)0xA4, /* 0x0250-0x0253 (9552-9555) */ -+ (char)0xA5, (char)0xA6, (char)0xA7, (char)0xA8, /* 0x0254-0x0257 (9556-9559) */ -+ (char)0xA9, (char)0xAA, (char)0xAB, (char)0xAC, /* 0x0258-0x025B (9560-9563) */ -+ (char)0xAD, (char)0xAE, (char)0xAF, (char)0xB0, /* 0x025C-0x025F (9564-9567) */ -+ -+ (char)0xB1, (char)0xB2, (char)0xB4, (char)0xB5, /* 0x0260-0x0263 (9568-9571) */ -+ (char)0xB6, (char)0xB7, (char)0xB8, (char)0xB9, /* 0x0264-0x0267 (9572-9575) */ -+ (char)0xBA, (char)0xBB, (char)0xBC, (char)0xBD, /* 0x0268-0x026B (9576-9579) */ -+ (char)0xBE /* 0x026C (9578 ) */ - }; - - static const cexcept exc2koiArray[] = - { -- { 0xA0 , 0x9A } , { 0xA9 , 0xBF } , { 0xB0 , 0x9C } , -- { 0xB2 , 0x9D } , { 0xB7 , 0x9E } , { 0xF7 , 0x9F } , -- { 0x0401 , 0xB3 } , { 0x0451 , 0xA3 } , { 0x220E , 0x94 } , -- { 0x2219 , 0x95 } , { 0x221A , 0x96 } , { 0x2248 , 0x97 } , -- { 0x2264 , 0x98 } , { 0x2265 , 0x99 } , { 0x2320 , 0x93 } , -- { 0x2321 , 0x9B } , { 0x2500 , 0x80 } , { 0x2502 , 0x81 } , -- { 0x250C , 0x82 } , { 0x2510 , 0x83 } , { 0x2514 , 0x84 } , -- { 0x2518 , 0x85 } , { 0x251C , 0x86 } , { 0x2524 , 0x87 } , -- { 0x252C , 0x88 } , { 0x2534 , 0x89 } , { 0x253C , 0x8A } , -- { 0x2580 , 0x8B } , { 0x2584 , 0x8C } , { 0x2588 , 0x8D } , -- { 0x258C , 0x8E } , { 0x2590 , 0x8F } , { 0x2591 , 0x90 } , -- { 0x2592 , 0x91 } , { 0x2593 , 0x92 } -+ { 0xA0 , (char)0x9A } , { 0xA9 , (char)0xBF } , { 0xB0 , (char)0x9C } , -+ { 0xB2 , (char)0x9D } , { 0xB7 , (char)0x9E } , { 0xF7 , (char)0x9F } , -+ { 0x0401 , (char)0xB3 } , { 0x0451 , (char)0xA3 } , { 0x220E , (char)0x94 } , -+ { 0x2219 , (char)0x95 } , { 0x221A , (char)0x96 } , { 0x2248 , (char)0x97 } , -+ { 0x2264 , (char)0x98 } , { 0x2265 , (char)0x99 } , { 0x2320 , (char)0x93 } , -+ { 0x2321 , (char)0x9B } , { 0x2500 , (char)0x80 } , { 0x2502 , (char)0x81 } , -+ { 0x250C , (char)0x82 } , { 0x2510 , (char)0x83 } , { 0x2514 , (char)0x84 } , -+ { 0x2518 , (char)0x85 } , { 0x251C , (char)0x86 } , { 0x2524 , (char)0x87 } , -+ { 0x252C , (char)0x88 } , { 0x2534 , (char)0x89 } , { 0x253C , (char)0x8A } , -+ { 0x2580 , (char)0x8B } , { 0x2584 , (char)0x8C } , { 0x2588 , (char)0x8D } , -+ { 0x258C , (char)0x8E } , { 0x2590 , (char)0x8F } , { 0x2591 , (char)0x90 } , -+ { 0x2592 , (char)0x91 } , { 0x2593 , (char)0x92 } - }; - - static const char uni2ibm866Array1[] = /* beginning with 0x0410 (1040) */ - { -- 0x80, 0x81, 0x82, 0x83, /* 0x0410-0x0413 (1040-1043) */ -- 0x84, 0x85, 0x86, 0x87, /* 0x0414-0x0417 (1044-1047) */ -- 0x88, 0x89, 0x8A, 0x8B, /* 0x0418-0x041B (1048-1051) */ -- 0x8C, 0x8D, 0x8E, 0x8F, /* 0x041C-0x041F (1042-1055) */ -- -- 0x90, 0x91, 0x92, 0x93, /* 0x0420-0x0423 (1056-1059) */ -- 0x94, 0x95, 0x96, 0x97, /* 0x0424-0x0427 (1060-1063) */ -- 0x98, 0x99, 0x9A, 0x9B, /* 0x0428-0x042B (1064-1067) */ -- 0x9C, 0x9D, 0x9E, 0x9F, /* 0x042C-0x042F (1068-1071) */ -- -- 0xA0, 0xA1, 0xA2, 0xA3, /* 0x0430-0x0433 (1072-1075) */ -- 0xA4, 0xA5, 0xA6, 0xA7, /* 0x0434-0x0437 (1076-1079) */ -- 0xA8, 0xA9, 0xAA, 0xAB, /* 0x0438-0x043B (1080-1083) */ -- 0xAC, 0xAD, 0xAE, 0xAF, /* 0x043C-0x043F (1084-1087) */ -- -- 0xE0, 0xE1, 0xE2, 0xE3, /* 0x0440-0x0443 (1088-1091) */ -- 0xE4, 0xE5, 0xE6, 0xE7, /* 0x0444-0x0447 (1092-1095) */ -- 0xE8, 0xE9, 0xEA, 0xEB, /* 0x0448-0x044B (1096-1099) */ -- 0xEC, 0xED, 0xEE, 0xEF, /* 0x044C-0x044F (1100-1103) */ -+ (char)0x80, (char)0x81, (char)0x82, (char)0x83, /* 0x0410-0x0413 (1040-1043) */ -+ (char)0x84, (char)0x85, (char)0x86, (char)0x87, /* 0x0414-0x0417 (1044-1047) */ -+ (char)0x88, (char)0x89, (char)0x8A, (char)0x8B, /* 0x0418-0x041B (1048-1051) */ -+ (char)0x8C, (char)0x8D, (char)0x8E, (char)0x8F, /* 0x041C-0x041F (1042-1055) */ -+ -+ (char)0x90, (char)0x91, (char)0x92, (char)0x93, /* 0x0420-0x0423 (1056-1059) */ -+ (char)0x94, (char)0x95, (char)0x96, (char)0x97, /* 0x0424-0x0427 (1060-1063) */ -+ (char)0x98, (char)0x99, (char)0x9A, (char)0x9B, /* 0x0428-0x042B (1064-1067) */ -+ (char)0x9C, (char)0x9D, (char)0x9E, (char)0x9F, /* 0x042C-0x042F (1068-1071) */ -+ -+ (char)0xA0, (char)0xA1, (char)0xA2, (char)0xA3, /* 0x0430-0x0433 (1072-1075) */ -+ (char)0xA4, (char)0xA5, (char)0xA6, (char)0xA7, /* 0x0434-0x0437 (1076-1079) */ -+ (char)0xA8, (char)0xA9, (char)0xAA, (char)0xAB, /* 0x0438-0x043B (1080-1083) */ -+ (char)0xAC, (char)0xAD, (char)0xAE, (char)0xAF, /* 0x043C-0x043F (1084-1087) */ -+ -+ (char)0xE0, (char)0xE1, (char)0xE2, (char)0xE3, /* 0x0440-0x0443 (1088-1091) */ -+ (char)0xE4, (char)0xE5, (char)0xE6, (char)0xE7, /* 0x0444-0x0447 (1092-1095) */ -+ (char)0xE8, (char)0xE9, (char)0xEA, (char)0xEB, /* 0x0448-0x044B (1096-1099) */ -+ (char)0xEC, (char)0xED, (char)0xEE, (char)0xEF, /* 0x044C-0x044F (1100-1103) */ - }; - - static const char uni2ibm866Array2[] = /* beginning with 0x2550 (9552) */ - { -- 0xCD, 0xBA, 0xD5, 0xD6, /* 0x2550-0x2553 (9552-9555) */ -- 0xC9, 0xB8, 0xB7, 0xBB, /* 0x2554-0x2557 (9556-9559) */ -- 0xD4, 0xD3, 0xC8, 0xBE, /* 0x2558-0x255B (9560-9563) */ -- 0xBD, 0xBC, 0xC6, 0xC7, /* 0x255C-0x255F (9564-9567) */ -- -- 0xCC, 0xB5, 0xB6, 0xB9, /* 0x2560-0x2563 (9568-9571) */ -- 0xD1, 0xD2, 0xCB, 0xCF, /* 0x2564-0x2567 (9572-9575) */ -- 0xD0, 0xCA, 0xD8, 0xD7, /* 0x2568-0x256B (9576-9579) */ -- 0xCE, /* 0x256C (9578 ) */ -+ (char)0xCD, (char)0xBA, (char)0xD5, (char)0xD6, /* 0x2550-0x2553 (9552-9555) */ -+ (char)0xC9, (char)0xB8, (char)0xB7, (char)0xBB, /* 0x2554-0x2557 (9556-9559) */ -+ (char)0xD4, (char)0xD3, (char)0xC8, (char)0xBE, /* 0x2558-0x255B (9560-9563) */ -+ (char)0xBD, (char)0xBC, (char)0xC6, (char)0xC7, /* 0x255C-0x255F (9564-9567) */ -+ -+ (char)0xCC, (char)0xB5, (char)0xB6, (char)0xB9, /* 0x2560-0x2563 (9568-9571) */ -+ (char)0xD1, (char)0xD2, (char)0xCB, (char)0xCF, /* 0x2564-0x2567 (9572-9575) */ -+ (char)0xD0, (char)0xCA, (char)0xD8, (char)0xD7, /* 0x2568-0x256B (9576-9579) */ -+ (char)0xCE, /* 0x256C (9578 ) */ - }; - - static const cexcept exc2ibm866Array[] = - { --{ 0xA0 , 0xFF } , { 0xA4 , 0xFD } , { 0xB0 , 0xF8 } , --{ 0xB7 , 0xFA } , { 0x0401 , 0xF0 } , { 0x0404 , 0xF2 } , --{ 0x0407 , 0xF4 } , { 0x040E , 0xF6 } , { 0x0451 , 0xF1 } , --{ 0x0454 , 0xF3 } , { 0x0457 , 0xF5 } , { 0x045E , 0xF7 } , --{ 0x2116 , 0xFC } , { 0x2219 , 0xF9 } , { 0x221A , 0xFB } , --{ 0x2500 , 0xC4 } , { 0x2502 , 0xB3 } , { 0x250C , 0xDA } , --{ 0x2510 , 0xBF } , { 0x2514 , 0xC0 } , { 0x2518 , 0xD9 } , --{ 0x251C , 0xC3 } , { 0x2524 , 0xB4 } , { 0x252C , 0xC2 } , --{ 0x2534 , 0xC1 } , { 0x253C , 0xC5 } , { 0x2580 , 0xDF } , --{ 0x2584 , 0xDC } , { 0x2588 , 0xDB } , { 0x258C , 0xDD } , --{ 0x2590 , 0xDE } , { 0x2591 , 0xB0 } , { 0x2592 , 0xB1 } , --{ 0x2593 , 0xB2 } , { 0x25A0 , 0xFE } , -+{ 0xA0 , (char)0xFF } , { 0xA4 , (char)0xFD } , { 0xB0 , (char)0xF8 } , -+{ 0xB7 , (char)0xFA } , { 0x0401 , (char)0xF0 } , { 0x0404 , (char)0xF2 } , -+{ 0x0407 , (char)0xF4 } , { 0x040E , (char)0xF6 } , { 0x0451 , (char)0xF1 } , -+{ 0x0454 , (char)0xF3 } , { 0x0457 , (char)0xF5 } , { 0x045E , (char)0xF7 } , -+{ 0x2116 , (char)0xFC } , { 0x2219 , (char)0xF9 } , { 0x221A , (char)0xFB } , -+{ 0x2500 , (char)0xC4 } , { 0x2502 , (char)0xB3 } , { 0x250C , (char)0xDA } , -+{ 0x2510 , (char)0xBF } , { 0x2514 , (char)0xC0 } , { 0x2518 , (char)0xD9 } , -+{ 0x251C , (char)0xC3 } , { 0x2524 , (char)0xB4 } , { 0x252C , (char)0xC2 } , -+{ 0x2534 , (char)0xC1 } , { 0x253C , (char)0xC5 } , { 0x2580 , (char)0xDF } , -+{ 0x2584 , (char)0xDC } , { 0x2588 , (char)0xDB } , { 0x258C , (char)0xDD } , -+{ 0x2590 , (char)0xDE } , { 0x2591 , (char)0xB0 } , { 0x2592 , (char)0xB1 } , -+{ 0x2593 , (char)0xB2 } , { 0x25A0 , (char)0xFE } , - }; - - static const char uni2isoArray[] = /* beginning with 0x0100 (256) */ - { -- 0xC0, 0xE0, 0xC3, 0xE3, /* 0x0100-0x0103 (256-259) */ -- 0xA1, 0xB1, 0xC6, 0xE6, /* 0x0104-0x0107 (260-263) */ -- 0xC6, 0xE6, 0xC5, 0xE5, /* 0x0108-0x010B (264-267) */ -- 0xC8, 0xE8, 0xCF, 0xEF, /* 0x010C-0x010F (268-271) */ -- -- 0xD0, 0xF0, 0xAA, 0xBA, /* 0x0110-0x0113 (272-275) */ -- '\0', '\0', 0xCC, 0xEC, /* 0x0114-0x0117 (276-279) */ -- 0xCA, 0xEA, 0xCC, 0xEC, /* 0x0118-0x011B (280-283) */ -- 0xD8, 0xF8, 0xAB, 0xBB, /* 0x011C-0x011F (284-287) */ -- -- 0xD5, 0xF5, 0xAB, 0xBB, /* 0x0120-0x0123 (288-291) */ -- 0xA6, 0xB6, 0xA1, 0xB1, /* 0x0124-0x0127 (292-295) */ -- 0xA5, 0xB5, 0xCF, 0xEF, /* 0x0128-0x012B (296-299) */ -- '\0', '\0', 0xC7, 0xE7, /* 0x012C-0x012F (300-302) */ -- -- 0xA9, 0xB9, '\0', '\0', /* 0x0130-0x0133 (304-307) */ -- 0xAC, 0xBC, 0xD3, 0xF3, /* 0x0134-0x0137 (308-311) */ -- 0xA2, 0xC5, 0xE5, 0xA6, /* 0x0138-0x013B (312-315) */ -- 0xB6, 0xA5, 0xB5, '\0', /* 0x013C-0x013F (316-319) */ -- -- '\0', 0xA3, 0xB3, 0xD1, /* 0x0140-0x0143 (320-323) */ -- 0xF1, 0xD1, 0xF1, 0xD2, /* 0x0144-0x0147 (324-327) */ -- 0xF2, '\0', 0xBD, 0xBF, /* 0x0148-0x014B (328-331) */ -- 0xD2, 0xF2, '\0', '\0', /* 0x014C-0x014F (332-335) */ -- -- 0xD5, 0xF5, '\0', '\0', /* 0x0150-0x0153 (336-339) */ -- 0xC0, 0xE0, 0xA3, 0xB3, /* 0x0154-0x0157 (340-343) */ -- 0xD8, 0xF8, 0xA6, 0xB6, /* 0x0158-0x015B (344-347) */ -- 0xDE, 0xFE, 0xAA, 0xBA, /* 0x015C-0x015F (348-351) */ -- -- 0xA9, 0xB9, 0xDE, 0xFE, /* 0x0160-0x0163 (352-355) */ -- 0xAB, 0xBB, 0xFC, 0xAD, /* 0x0164-0x0167 (356-359) */ -- 0xDD, 0xFD, 0xDE, 0xFE, /* 0x0168-0x016B (360-363) */ -- 0xDD, 0xFD, 0xD9, 0xF9, /* 0x016C-0x016F (364-367) */ -- -- 0xDB, 0xFB, 0xD9, 0xF9, /* 0x0170-0x0173 (368-371) */ -- '\0', '\0', '\0', '\0', /* 0x0174-0x0177 (372-375) */ -- '\0', 0xAC, 0xBC, 0xAF, /* 0x0178-0x017B (376-379) */ -- 0xBF, 0xAE, 0xBE, '\0' /* 0x017C-0x017F (380-383) */ -+ (char)0xC0, (char)0xE0, (char)0xC3, (char)0xE3, /* 0x0100-0x0103 (256-259) */ -+ (char)0xA1, (char)0xB1, (char)0xC6, (char)0xE6, /* 0x0104-0x0107 (260-263) */ -+ (char)0xC6, (char)0xE6, (char)0xC5, (char)0xE5, /* 0x0108-0x010B (264-267) */ -+ (char)0xC8, (char)0xE8, (char)0xCF, (char)0xEF, /* 0x010C-0x010F (268-271) */ -+ -+ (char)0xD0, (char)0xF0, (char)0xAA, (char)0xBA, /* 0x0110-0x0113 (272-275) */ -+ (char)'\0', (char)'\0', (char)0xCC, (char)0xEC, /* 0x0114-0x0117 (276-279) */ -+ (char)0xCA, (char)0xEA, (char)0xCC, (char)0xEC, /* 0x0118-0x011B (280-283) */ -+ (char)0xD8, (char)0xF8, (char)0xAB, (char)0xBB, /* 0x011C-0x011F (284-287) */ -+ -+ (char)0xD5, (char)0xF5, (char)0xAB, (char)0xBB, /* 0x0120-0x0123 (288-291) */ -+ (char)0xA6, (char)0xB6, (char)0xA1, (char)0xB1, /* 0x0124-0x0127 (292-295) */ -+ (char)0xA5, (char)0xB5, (char)0xCF, (char)0xEF, /* 0x0128-0x012B (296-299) */ -+ (char)'\0', (char)'\0', (char)0xC7, (char)0xE7, /* 0x012C-0x012F (300-302) */ -+ -+ (char)0xA9, (char)0xB9, (char)'\0', (char)'\0', /* 0x0130-0x0133 (304-307) */ -+ (char)0xAC, (char)0xBC, (char)0xD3, (char)0xF3, /* 0x0134-0x0137 (308-311) */ -+ (char)0xA2, (char)0xC5, (char)0xE5, (char)0xA6, /* 0x0138-0x013B (312-315) */ -+ (char)0xB6, (char)0xA5, (char)0xB5, (char)'\0', /* 0x013C-0x013F (316-319) */ -+ -+ (char)'\0', (char)0xA3, (char)0xB3, (char)0xD1, /* 0x0140-0x0143 (320-323) */ -+ (char)0xF1, (char)0xD1, (char)0xF1, (char)0xD2, /* 0x0144-0x0147 (324-327) */ -+ (char)0xF2, (char)'\0', (char)0xBD, (char)0xBF, /* 0x0148-0x014B (328-331) */ -+ (char)0xD2, (char)0xF2, (char)'\0', (char)'\0', /* 0x014C-0x014F (332-335) */ -+ -+ (char)0xD5, (char)0xF5, (char)'\0', (char)'\0', /* 0x0150-0x0153 (336-339) */ -+ (char)0xC0, (char)0xE0, (char)0xA3, (char)0xB3, /* 0x0154-0x0157 (340-343) */ -+ (char)0xD8, (char)0xF8, (char)0xA6, (char)0xB6, /* 0x0158-0x015B (344-347) */ -+ (char)0xDE, (char)0xFE, (char)0xAA, (char)0xBA, /* 0x015C-0x015F (348-351) */ -+ -+ (char)0xA9, (char)0xB9, (char)0xDE, (char)0xFE, /* 0x0160-0x0163 (352-355) */ -+ (char)0xAB, (char)0xBB, (char)0xFC, (char)0xAD, /* 0x0164-0x0167 (356-359) */ -+ (char)0xDD, (char)0xFD, (char)0xDE, (char)0xFE, /* 0x0168-0x016B (360-363) */ -+ (char)0xDD, (char)0xFD, (char)0xD9, (char)0xF9, /* 0x016C-0x016F (364-367) */ -+ -+ (char)0xDB, (char)0xFB, (char)0xD9, (char)0xF9, /* 0x0170-0x0173 (368-371) */ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x0174-0x0177 (372-375) */ -+ (char)'\0', (char)0xAC, (char)0xBC, (char)0xAF, /* 0x0178-0x017B (376-379) */ -+ (char)0xBF, (char)0xAE, (char)0xBE, (char)'\0' /* 0x017C-0x017F (380-383) */ - }; - - static const cexcept exc2iso2Array[] = +-static const char uni2macArray[] = /* beginning with 0xA0 (160) */ ++static const unsigned char uni2macArray[] = /* beginning with 0xA0 (160) */ { -- { 0x02C7 , 0xB7 } , { 0x02D8 , 0xA2 } , { 0x02D9 , 0xFF } , -- { 0x02DB , 0xB2 } , { 0x02DD , 0xBD } -+ { 0x02C7 , (char)0xB7 } , { 0x02D8 , (char)0xA2 } , { 0x02D9 , (char)0xFF } , -+ { 0x02DB , (char)0xB2 } , { 0x02DD , (char)0xBD } + 0xCA, 0xC1, 0xA2, 0xA3, /* 0xA0-0xA3 (160-163) */ + 0xDB, 0xB4, '\0', 0xA4, /* 0xA4-0xA7 (164-167) */ +@@ -166,7 +166,7 @@ static const cexcept exc2macArray[] = + { 0xFB01 , 0xDE } , { 0xFB02 , 0xDF } }; - static const cexcept exc2iso3Array[] = +-static const char uni2koiArray1[] = /* beginning with 0x0410 (1040) */ ++static const unsigned char uni2koiArray1[] = /* beginning with 0x0410 (1040) */ { -- { 0x02D8 , 0xA2 } , { 0x02D9 , 0xFF } -+ { 0x02D8 , (char)0xA2 } , { 0x02D9 , (char)0xFF } + 0xE1, 0xE2, 0xF7, 0xE7, /* 0x0410-0x0413 (1040-1043) */ + 0xE4, 0xE5, 0xF6, 0xFA, /* 0x0414-0x0417 (1044-1047) */ +@@ -189,7 +189,7 @@ static const char uni2koiArray1[] = /* beginning with 0x0410 (1040) */ + 0xD8, 0xDC, 0xC0, 0xD1 /* 0x044C-0x044F (1100-1103) */ }; - static const cexcept exc2iso4Array[] = +-static const char uni2koiArray2[] = /* beginning with 0x2550 (9552) */ ++static const unsigned char uni2koiArray2[] = /* beginning with 0x2550 (9552) */ { -- { 0x02C7 , 0xB7 } , { 0x02C9 , 0xAF } , { 0x02D9 , 0xFF } , -- { 0x02DB , 0xB2 } -+ { 0x02C7 , (char)0xB7 } , { 0x02C9 , (char)0xAF } , { 0x02D9 , (char)0xFF } , -+ { 0x02DB , (char)0xB2 } + 0xA0, 0xA1, 0xA2, 0xA4, /* 0x0250-0x0253 (9552-9555) */ + 0xA5, 0xA6, 0xA7, 0xA8, /* 0x0254-0x0257 (9556-9559) */ +@@ -218,7 +218,7 @@ static const cexcept exc2koiArray[] = + { 0x2592 , 0x91 } , { 0x2593 , 0x92 } }; - static const cexcept exc2iso7Array[] = +-static const char uni2ibm866Array1[] = /* beginning with 0x0410 (1040) */ ++static const unsigned char uni2ibm866Array1[] = /* beginning with 0x0410 (1040) */ { -- { 0x02BC , 0xA2 } , { 0x02BD , 0xA1 } , { 0x0385 , 0xB5 } , -- { 0x0386 , 0xB6 } , { 0x0388 , 0xB8 } , { 0x0389 , 0xB9 } , -- { 0x038A , 0xBA } , { 0x038C , 0xBC } , { 0x038E , 0xBE } , -- { 0x038F , 0xBF } -+ { 0x02BC , (char)0xA2 } , { 0x02BD , (char)0xA1 } , { 0x0385 , (char)0xB5 } , -+ { 0x0386 , (char)0xB6 } , { 0x0388 , (char)0xB8 } , { 0x0389 , (char)0xB9 } , -+ { 0x038A , (char)0xBA } , { 0x038C , (char)0xBC } , { 0x038E , (char)0xBE } , -+ { 0x038F , (char)0xBF } + 0x80, 0x81, 0x82, 0x83, /* 0x0410-0x0413 (1040-1043) */ + 0x84, 0x85, 0x86, 0x87, /* 0x0414-0x0417 (1044-1047) */ +@@ -241,7 +241,7 @@ static const char uni2ibm866Array1[] = /* beginning with 0x0410 (1040) */ + 0xEC, 0xED, 0xEE, 0xEF, /* 0x044C-0x044F (1100-1103) */ }; - static const cexcept exc2iso8Array[] = +-static const char uni2ibm866Array2[] = /* beginning with 0x2550 (9552) */ ++static const unsigned char uni2ibm866Array2[] = /* beginning with 0x2550 (9552) */ { -- { 0x00D7 , 0xAA } , { 0x00E7 , 0xBA } , { 0x0333 , 0xDF } -+ { 0x00D7 , (char)0xAA } , { 0x00E7 , (char)0xBA } , { 0x0333 , (char)0xDF } + 0xCD, 0xBA, 0xD5, 0xD6, /* 0x2550-0x2553 (9552-9555) */ + 0xC9, 0xB8, 0xB7, 0xBB, /* 0x2554-0x2557 (9556-9559) */ +@@ -270,7 +270,7 @@ static const cexcept exc2ibm866Array[] = + { 0x2593 , 0xB2 } , { 0x25A0 , 0xFE } , }; - static const cexcept exc2iso9Array[] = +-static const char uni2isoArray[] = /* beginning with 0x0100 (256) */ ++static const unsigned char uni2isoArray[] = /* beginning with 0x0100 (256) */ { -- { 0x011E , 0xD0 } , { 0x011F , 0xF0 } , { 0x0130 , 0xDD } , -- { 0x0131 , 0xFD } , { 0x015E , 0xDE } , { 0x015F , 0xFE } -+ { 0x011E , (char)0xD0 } , { 0x011F , (char)0xF0 } , { 0x0130 , (char)0xDD } , -+ { 0x0131 , (char)0xFD } , { 0x015E , (char)0xDE } , { 0x015F , (char)0xFE } + 0xC0, 0xE0, 0xC3, 0xE3, /* 0x0100-0x0103 (256-259) */ + 0xA1, 0xB1, 0xC6, 0xE6, /* 0x0104-0x0107 (260-263) */ +@@ -363,7 +363,7 @@ static const cexcept exc2iso10Array[] = + { 0x0336 , 0xBD } }; - static const cexcept exc2iso10Array[] = +-static const char uni2ibmArray1[] = /* beginning with 0xA0 (160) */ ++static const unsigned char uni2ibmArray1[] = /* beginning with 0xA0 (160) */ { -- { 0x0110 , 0xA9 } , { 0x0111 , 0xB9 } , { 0x0112 , 0xA2 } , -- { 0x0113 , 0xB2 } , { 0x0122 , 0xA3 } , { 0x0123 , 0xB3 } , -- { 0x012A , 0xA4 } , { 0x012B , 0xB4 } , { 0x0130 , 0xBD } , -- { 0x0136 , 0xA6 } , { 0x0137 , 0xB6 } , { 0x0138 , 0xFF } , -- { 0x013B , 0xA8 } , { 0x013C , 0xA8 } , { 0x014A , 0xAF } , -- { 0x015E , 0xBE } , { 0x0160 , 0xAA } , { 0x0161 , 0xBA } , -- { 0x0166 , 0xAB } , { 0x0167 , 0xBB } , { 0x0168 , 0xD7 } , -- { 0x0169 , 0xF7 } , { 0x016A , 0xAE } , { 0x016B , 0xBE } , -- { 0x017D , 0xAC } , { 0x017E , 0xBC } , { 0x0335 , 0xAD } , -- { 0x0336 , 0xBD } -+ { 0x0110 , (char)0xA9 } , { 0x0111 , (char)0xB9 } , { 0x0112 , (char)0xA2 } , -+ { 0x0113 , (char)0xB2 } , { 0x0122 , (char)0xA3 } , { 0x0123 , (char)0xB3 } , -+ { 0x012A , (char)0xA4 } , { 0x012B , (char)0xB4 } , { 0x0130 , (char)0xBD } , -+ { 0x0136 , (char)0xA6 } , { 0x0137 , (char)0xB6 } , { 0x0138 , (char)0xFF } , -+ { 0x013B , (char)0xA8 } , { 0x013C , (char)0xA8 } , { 0x014A , (char)0xAF } , -+ { 0x015E , (char)0xBE } , { 0x0160 , (char)0xAA } , { 0x0161 , (char)0xBA } , -+ { 0x0166 , (char)0xAB } , { 0x0167 , (char)0xBB } , { 0x0168 , (char)0xD7 } , -+ { 0x0169 , (char)0xF7 } , { 0x016A , (char)0xAE } , { 0x016B , (char)0xBE } , -+ { 0x017D , (char)0xAC } , { 0x017E , (char)0xBC } , { 0x0335 , (char)0xAD } , -+ { 0x0336 , (char)0xBD } + 0xFF, 0xAD, 0x9B, 0x9C, /* 0xA0-0xA3 (160-163) */ + 0xCF, 0x9D, 0xDD, 0x15, /* 0xA4-0xA7 (164-167) */ +@@ -436,7 +436,7 @@ static const char uni2ibmArray1[] = /* beginning with 0xA0 (160) */ + 0xBE, 0xA6, 0xA7, '\0' /* 0x017C-0x017F (380-383) */ }; - static const char uni2ibmArray1[] = /* beginning with 0xA0 (160) */ +-static const char uni2ibmArray2[] = /* beginning with 0x2550 (9552) */ ++static const unsigned char uni2ibmArray2[] = /* beginning with 0x2550 (9552) */ { -- 0xFF, 0xAD, 0x9B, 0x9C, /* 0xA0-0xA3 (160-163) */ -- 0xCF, 0x9D, 0xDD, 0x15, /* 0xA4-0xA7 (164-167) */ -- 0xF9, 0xB7, 0xA6, 0xAE, /* 0xA8-0xAB (168-171) */ -- 0xAA, 0xF0, 0xA9, 0xEE, /* 0xAC-0xAF (172-175) */ -- -- 0xF8, 0xF1, 0xFD, 0xFC, /* 0xB0-0xB3 (176-179) */ -- 0xEF, 0xE6, 0x14, 0xF9, /* 0xB4-0xB7 (180-183) */ -- 0xF7, 0xD5, 0xA7, 0xAF, /* 0xB8-0xBB (184-187) */ -- 0xAC, 0xAB, 0xF3, 0xA8, /* 0xBC-0xBF (188-191) */ -- -- 0xB7, 0xB5, 0xB6, 0xC7, /* 0xC0-0xC3 (192-195) */ -- 0x8E, 0x8F, 0x92, 0x80, /* 0xC4-0xC7 (196-199) */ -- 0xD4, 0x90, 0xD2, 0xD3, /* 0xC8-0xCB (200-203) */ -- 0xDE, 0xD6, 0xD7, 0xD8, /* 0xCC-0xCF (204-207) */ -- -- 0xD1, 0xA5, 0xE3, 0xE0, /* 0xD0-0xD3 (208-211) */ -- 0xE2, 0xE5, 0x99, 0x8E, /* 0xD4-0xD7 (202-215) */ -- 0x9D, 0xEB, 0xE9, 0xEA, /* 0xD8-0xDB (216-219) */ -- 0x9A, 0xED, 0xE8, 0xE1, /* 0xDC-0xDF (220-223) */ -- -- 0x85, 0xA0, 0x83, 0xC6, /* 0xE0-0xE3 (224-227) */ -- 0x84, 0x86, 0x91, 0x87, /* 0xE4-0xE7 (228-231) */ -- 0x8A, 0x82, 0x88, 0x89, /* 0xE8-0xEB (232-235) */ -- 0x8D, 0xA1, 0x8C, 0x8B, /* 0xEC-0xEF (236-239) */ -- -- 0xD0, 0xA4, 0x95, 0xA2, /* 0xF0-0xF3 (240-243) */ -- 0x93, 0xE4, 0x94, 0xF6, /* 0xF4-0xF7 (244-247) */ -- 0x9B, 0x97, 0xA3, 0x96, /* 0xF8-0xFB (248-251) */ -- 0x81, 0xEC, 0xE7, 0x98, /* 0xFC-0xFF (252-255) */ -- -- '\0', '\0', 0xC6, 0xC7, /* 0x0100-0x0103 (256-259) */ -- 0xA4, 0xA5, 0x8F, 0x86, /* 0x0104-0x0107 (260-263) */ -- '\0', '\0', '\0', '\0', /* 0x0108-0x010B (264-267) */ -- 0xAC, 0x9F, 0xD2, 0xD4, /* 0x010C-0x010F (268-271) */ -- -- 0xD1, 0xD0, '\0', '\0', /* 0x0110-0x0113 (272-275) */ -- '\0', '\0', '\0', '\0', /* 0x0114-0x0117 (276-279) */ -- 0xA8, 0xA9, 0xB7, 0xD8, /* 0x0118-0x011B (280-283) */ -- '\0', '\0', '\0', '\0', /* 0x011C-0x011F (284-287) */ -- -- '\0', '\0', '\0', '\0', /* 0x0120-0x0123 (288-291) */ -- '\0', '\0', '\0', '\0', /* 0x0124-0x0127 (292-295) */ -- '\0', '\0', '\0', '\0', /* 0x0128-0x012B (296-299) */ -- '\0', '\0', '\0', '\0', /* 0x012C-0x012F (300-302) */ -- -- '\0', '\0', '\0', '\0', /* 0x0130-0x0133 (304-307) */ -- '\0', '\0', '\0', '\0', /* 0x0134-0x0137 (308-311) */ -- '\0', 0x91, 0x92, '\0', /* 0x0138-0x013B (312-315) */ -- '\0', 0x95, 0x96, '\0', /* 0x013C-0x013F (316-319) */ -- -- '\0', 0x9D, 0x88, 0xE5, /* 0x0140-0x0143 (320-323) */ -- 0xE4, '\0', '\0', 0xD5, /* 0x0144-0x0147 (324-327) */ -- 0xE5, '\0', '\0', '\0', /* 0x0148-0x014B (328-331) */ -- '\0', '\0', '\0', '\0', /* 0x014C-0x014F (332-335) */ -- -- 0x8A, 0x8B, '\0', '\0', /* 0x0150-0x0153 (336-339) */ -- 0xE8, 0xEA, '\0', '\0', /* 0x0154-0x0157 (340-343) */ -- 0xFC, 0xFD, 0x97, 0x98, /* 0x0158-0x015B (344-347) */ -- '\0', '\0', 0xB8, 0xAD, /* 0x015C-0x015F (348-351) */ -- -- 0xE6, 0xE7, 0xDD, 0xEE, /* 0x0160-0x0163 (352-355) */ -- 0x9B, 0x9C, '\0', '\0', /* 0x0164-0x0167 (356-359) */ -- '\0', '\0', '\0', '\0', /* 0x0168-0x016B (360-363) */ -- '\0', '\0', 0xDE, 0x85, /* 0x016C-0x016F (364-367) */ -- -- 0xEB, 0xFB, '\0', '\0', /* 0x0170-0x0173 (368-371) */ -- '\0', '\0', '\0', '\0', /* 0x0174-0x0177 (372-375) */ -- '\0', 0x8D, 0xAB, 0xBD, /* 0x0178-0x017B (376-379) */ -- 0xBE, 0xA6, 0xA7, '\0' /* 0x017C-0x017F (380-383) */ -+ (char)0xFF, (char)0xAD, (char)0x9B, (char)0x9C, /* 0xA0-0xA3 (160-163) */ -+ (char)0xCF, (char)0x9D, (char)0xDD, (char)0x15, /* 0xA4-0xA7 (164-167) */ -+ (char)0xF9, (char)0xB7, (char)0xA6, (char)0xAE, /* 0xA8-0xAB (168-171) */ -+ (char)0xAA, (char)0xF0, (char)0xA9, (char)0xEE, /* 0xAC-0xAF (172-175) */ -+ -+ (char)0xF8, (char)0xF1, (char)0xFD, (char)0xFC, /* 0xB0-0xB3 (176-179) */ -+ (char)0xEF, (char)0xE6, (char)0x14, (char)0xF9, /* 0xB4-0xB7 (180-183) */ -+ (char)0xF7, (char)0xD5, (char)0xA7, (char)0xAF, /* 0xB8-0xBB (184-187) */ -+ (char)0xAC, (char)0xAB, (char)0xF3, (char)0xA8, /* 0xBC-0xBF (188-191) */ -+ -+ (char)0xB7, (char)0xB5, (char)0xB6, (char)0xC7, /* 0xC0-0xC3 (192-195) */ -+ (char)0x8E, (char)0x8F, (char)0x92, (char)0x80, /* 0xC4-0xC7 (196-199) */ -+ (char)0xD4, (char)0x90, (char)0xD2, (char)0xD3, /* 0xC8-0xCB (200-203) */ -+ (char)0xDE, (char)0xD6, (char)0xD7, (char)0xD8, /* 0xCC-0xCF (204-207) */ -+ -+ (char)0xD1, (char)0xA5, (char)0xE3, (char)0xE0, /* 0xD0-0xD3 (208-211) */ -+ (char)0xE2, (char)0xE5, (char)0x99, (char)0x8E, /* 0xD4-0xD7 (202-215) */ -+ (char)0x9D, (char)0xEB, (char)0xE9, (char)0xEA, /* 0xD8-0xDB (216-219) */ -+ (char)0x9A, (char)0xED, (char)0xE8, (char)0xE1, /* 0xDC-0xDF (220-223) */ -+ -+ (char)0x85, (char)0xA0, (char)0x83, (char)0xC6, /* 0xE0-0xE3 (224-227) */ -+ (char)0x84, (char)0x86, (char)0x91, (char)0x87, /* 0xE4-0xE7 (228-231) */ -+ (char)0x8A, (char)0x82, (char)0x88, (char)0x89, /* 0xE8-0xEB (232-235) */ -+ (char)0x8D, (char)0xA1, (char)0x8C, (char)0x8B, /* 0xEC-0xEF (236-239) */ -+ -+ (char)0xD0, (char)0xA4, (char)0x95, (char)0xA2, /* 0xF0-0xF3 (240-243) */ -+ (char)0x93, (char)0xE4, (char)0x94, (char)0xF6, /* 0xF4-0xF7 (244-247) */ -+ (char)0x9B, (char)0x97, (char)0xA3, (char)0x96, /* 0xF8-0xFB (248-251) */ -+ (char)0x81, (char)0xEC, (char)0xE7, (char)0x98, /* 0xFC-0xFF (252-255) */ -+ -+ (char)'\0', (char)'\0', (char)0xC6, (char)0xC7, /* 0x0100-0x0103 (256-259) */ -+ (char)0xA4, (char)0xA5, (char)0x8F, (char)0x86, /* 0x0104-0x0107 (260-263) */ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x0108-0x010B (264-267) */ -+ (char)0xAC, (char)0x9F, (char)0xD2, (char)0xD4, /* 0x010C-0x010F (268-271) */ -+ -+ (char)0xD1, (char)0xD0, (char)'\0', (char)'\0', /* 0x0110-0x0113 (272-275) */ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x0114-0x0117 (276-279) */ -+ (char)0xA8, (char)0xA9, (char)0xB7, (char)0xD8, /* 0x0118-0x011B (280-283) */ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x011C-0x011F (284-287) */ -+ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x0120-0x0123 (288-291) */ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x0124-0x0127 (292-295) */ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x0128-0x012B (296-299) */ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x012C-0x012F (300-302) */ -+ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x0130-0x0133 (304-307) */ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x0134-0x0137 (308-311) */ -+ (char)'\0', (char)0x91, (char)0x92, (char)'\0', /* 0x0138-0x013B (312-315) */ -+ (char)'\0', (char)0x95, (char)0x96, (char)'\0', /* 0x013C-0x013F (316-319) */ -+ -+ (char)'\0', (char)0x9D, (char)0x88, (char)0xE5, /* 0x0140-0x0143 (320-323) */ -+ (char)0xE4, (char)'\0', (char)'\0', (char)0xD5, /* 0x0144-0x0147 (324-327) */ -+ (char)0xE5, (char)'\0', (char)'\0', (char)'\0', /* 0x0148-0x014B (328-331) */ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x014C-0x014F (332-335) */ -+ -+ (char)0x8A, (char)0x8B, (char)'\0', (char)'\0', /* 0x0150-0x0153 (336-339) */ -+ (char)0xE8, (char)0xEA, (char)'\0', (char)'\0', /* 0x0154-0x0157 (340-343) */ -+ (char)0xFC, (char)0xFD, (char)0x97, (char)0x98, /* 0x0158-0x015B (344-347) */ -+ (char)'\0', (char)'\0', (char)0xB8, (char)0xAD, /* 0x015C-0x015F (348-351) */ -+ -+ (char)0xE6, (char)0xE7, (char)0xDD, (char)0xEE, /* 0x0160-0x0163 (352-355) */ -+ (char)0x9B, (char)0x9C, (char)'\0', (char)'\0', /* 0x0164-0x0167 (356-359) */ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x0168-0x016B (360-363) */ -+ (char)'\0', (char)'\0', (char)0xDE, (char)0x85, /* 0x016C-0x016F (364-367) */ -+ -+ (char)0xEB, (char)0xFB, (char)'\0', (char)'\0', /* 0x0170-0x0173 (368-371) */ -+ (char)'\0', (char)'\0', (char)'\0', (char)'\0', /* 0x0174-0x0177 (372-375) */ -+ (char)'\0', (char)0x8D, (char)0xAB, (char)0xBD, /* 0x0178-0x017B (376-379) */ -+ (char)0xBE, (char)0xA6, (char)0xA7, (char)'\0' /* 0x017C-0x017F (380-383) */ - }; - - static const char uni2ibmArray2[] = /* beginning with 0x2550 (9552) */ - { -- 0xCD, 0xBA, 0xD5, 0xD6, /* 0x0250-0x0253 (9552-9555) */ -- 0xC9, 0xB8, 0xB7, 0xBB, /* 0x0254-0x0257 (9556-9559) */ -- 0xD4, 0xD3, 0xC8, 0xBE, /* 0x0258-0x025B (9560-9563) */ -- 0xBD, 0xBC, 0xC6, 0xC7, /* 0x025C-0x025F (9564-9567) */ -- -- 0xCC, 0xB5, 0xB6, 0xB9, /* 0x0260-0x0263 (9568-9571) */ -- 0xD1, 0xD2, 0xCB, 0xCF, /* 0x0264-0x0267 (9572-9575) */ -- 0xD0, 0xCA, 0xD8, 0xD7, /* 0x0268-0x026B (9576-9579) */ -- 0xCE /* 0x026C (9578 ) */ -+ (char)0xCD, (char)0xBA, (char)0xD5, (char)0xD6, /* 0x0250-0x0253 (9552-9555) */ -+ (char)0xC9, (char)0xB8, (char)0xB7, (char)0xBB, /* 0x0254-0x0257 (9556-9559) */ -+ (char)0xD4, (char)0xD3, (char)0xC8, (char)0xBE, /* 0x0258-0x025B (9560-9563) */ -+ (char)0xBD, (char)0xBC, (char)0xC6, (char)0xC7, /* 0x025C-0x025F (9564-9567) */ -+ -+ (char)0xCC, (char)0xB5, (char)0xB6, (char)0xB9, /* 0x0260-0x0263 (9568-9571) */ -+ (char)0xD1, (char)0xD2, (char)0xCB, (char)0xCF, /* 0x0264-0x0267 (9572-9575) */ -+ (char)0xD0, (char)0xCA, (char)0xD8, (char)0xD7, /* 0x0268-0x026B (9576-9579) */ -+ (char)0xCE /* 0x026C (9578 ) */ - }; - - static const cexcept exc2ibm437Array[] = - { -- { 0x0192 , 0x9F } , { 0x0393 , 0xE2 } , { 0x0398 , 0xE9 } , -- { 0x03A0 , 0xE3 } , { 0x03A3 , 0xE4 } , { 0x03A6 , 0xE8 } , -- { 0x03A9 , 0xEA } , { 0x03B1 , 0xE0 } , { 0x03B4 , 0xEB } , -- { 0x03B7 , 0xFC } , { 0x03C3 , 0xE5 } , { 0x03D2 , 0xE7 } , -- { 0x20C3 , 0x13 } , { 0x2191 , 0x18 } , { 0x2192 , 0x1A } , -- { 0x2193 , 0x19 } , { 0x2194 , 0x1D } , { 0x2195 , 0x12 } , -- { 0x21A8 , 0x17 } , { 0x2205 , 0xED } , { 0x2208 , 0xEE } , -- { 0x220E , 0xFE } , { 0x2219 , 0xFA } , { 0x221A , 0xFB } , -- { 0x221E , 0xEC } , { 0x2229 , 0xEF } , { 0x2248 , 0xF7 } , -- { 0x2261 , 0xF0 } , { 0x2264 , 0xF3 } , { 0x2265 , 0xF2 } , -- { 0x2310 , 0xA9 } , { 0x2319 , 0x1C } , { 0x2320 , 0xF4 } , -- { 0x2321 , 0xF5 } , { 0x2500 , 0xC4 } , { 0x2502 , 0xB3 } , -- { 0x250C , 0xDA } , { 0x2510 , 0xBF } , { 0x2514 , 0xC0 } , -- { 0x2518 , 0xD9 } , { 0x251C , 0xC3 } , { 0x2524 , 0xB4 } , -- { 0x252C , 0xC2 } , { 0x2534 , 0xC1 } , { 0x253C , 0xC5 } , -- { 0x2580 , 0xDF } , { 0x2584 , 0xDC } , { 0x2588 , 0xDB } , -- { 0x258C , 0xDD } , { 0x2590 , 0xDE } , { 0x2591 , 0xB0 } , -- { 0x2592 , 0xB1 } , { 0x2593 , 0xB2 } , { 0x25B2 , 0x1E } , -- { 0x25B6 , 0x10 } , { 0x25BC , 0x1F } , { 0x25C0 , 0x11 } , -- { 0x263A , 0x01 } , { 0x263B , 0x02 } , { 0x2660 , 0x06 } , -- { 0x2663 , 0x05 } , { 0x2665 , 0x03 } , { 0x2666 , 0x04 } -+ { 0x0192 , (char)0x9F } , { 0x0393 , (char)0xE2 } , { 0x0398 , (char)0xE9 } , -+ { 0x03A0 , (char)0xE3 } , { 0x03A3 , (char)0xE4 } , { 0x03A6 , (char)0xE8 } , -+ { 0x03A9 , (char)0xEA } , { 0x03B1 , (char)0xE0 } , { 0x03B4 , (char)0xEB } , -+ { 0x03B7 , (char)0xFC } , { 0x03C3 , (char)0xE5 } , { 0x03D2 , (char)0xE7 } , -+ { 0x20C3 , (char)0x13 } , { 0x2191 , (char)0x18 } , { 0x2192 , (char)0x1A } , -+ { 0x2193 , (char)0x19 } , { 0x2194 , (char)0x1D } , { 0x2195 , (char)0x12 } , -+ { 0x21A8 , (char)0x17 } , { 0x2205 , (char)0xED } , { 0x2208 , (char)0xEE } , -+ { 0x220E , (char)0xFE } , { 0x2219 , (char)0xFA } , { 0x221A , (char)0xFB } , -+ { 0x221E , (char)0xEC } , { 0x2229 , (char)0xEF } , { 0x2248 , (char)0xF7 } , -+ { 0x2261 , (char)0xF0 } , { 0x2264 , (char)0xF3 } , { 0x2265 , (char)0xF2 } , -+ { 0x2310 , (char)0xA9 } , { 0x2319 , (char)0x1C } , { 0x2320 , (char)0xF4 } , -+ { 0x2321 , (char)0xF5 } , { 0x2500 , (char)0xC4 } , { 0x2502 , (char)0xB3 } , -+ { 0x250C , (char)0xDA } , { 0x2510 , (char)0xBF } , { 0x2514 , (char)0xC0 } , -+ { 0x2518 , (char)0xD9 } , { 0x251C , (char)0xC3 } , { 0x2524 , (char)0xB4 } , -+ { 0x252C , (char)0xC2 } , { 0x2534 , (char)0xC1 } , { 0x253C , (char)0xC5 } , -+ { 0x2580 , (char)0xDF } , { 0x2584 , (char)0xDC } , { 0x2588 , (char)0xDB } , -+ { 0x258C , (char)0xDD } , { 0x2590 , (char)0xDE } , { 0x2591 , (char)0xB0 } , -+ { 0x2592 , (char)0xB1 } , { 0x2593 , (char)0xB2 } , { 0x25B2 , (char)0x1E } , -+ { 0x25B6 , (char)0x10 } , { 0x25BC , (char)0x1F } , { 0x25C0 , (char)0x11 } , -+ { 0x263A , (char)0x01 } , { 0x263B , (char)0x02 } , { 0x2660 , (char)0x06 } , -+ { 0x2663 , (char)0x05 } , { 0x2665 , (char)0x03 } , { 0x2666 , (char)0x04 } - }; - - static const cexcept exc2ibm850Array[] = - { -- { 0x0192 , 0x9F } , { 0x20C3 , 0x13 } , { 0x2191 , 0x18 } , -- { 0x2192 , 0x1A } , { 0x2193 , 0x19 } , { 0x2194 , 0x1D } , -- { 0x2195 , 0x12 } , { 0x21A8 , 0x17 } , { 0x220E , 0xFE } , -- { 0x2219 , 0xFA } , { 0x2319 , 0x1C } , { 0x2500 , 0xC4 } , -- { 0x2502 , 0xB3 } , { 0x250C , 0xDA } , { 0x2510 , 0xBF } , -- { 0x2514 , 0xC0 } , { 0x2518 , 0xD9 } , { 0x251C , 0xC3 } , -- { 0x252C , 0xC2 } , { 0x2534 , 0xC1 } , { 0x253C , 0xC5 } , -- { 0x2580 , 0xDF } , { 0x2584 , 0xDC } , { 0x2588 , 0xDB } , -- { 0x2591 , 0xB0 } , { 0x2592 , 0xB1 } , { 0x2593 , 0xB2 } , -- { 0x25B2 , 0x1E } , { 0x25B6 , 0x10 } , { 0x25BC , 0x1F } , -- { 0x25C0 , 0x11 } , { 0x263A , 0x01 } , { 0x263B , 0x02 } , -- { 0x2660 , 0x06 } , { 0x2663 , 0x05 } , { 0x2665 , 0x03 } , -- { 0x2666 , 0x04 } -+ { 0x0192 , (char)0x9F } , { 0x20C3 , (char)0x13 } , { 0x2191 , (char)0x18 } , -+ { 0x2192 , (char)0x1A } , { 0x2193 , (char)0x19 } , { 0x2194 , (char)0x1D } , -+ { 0x2195 , (char)0x12 } , { 0x21A8 , (char)0x17 } , { 0x220E , (char)0xFE } , -+ { 0x2219 , (char)0xFA } , { 0x2319 , (char)0x1C } , { 0x2500 , (char)0xC4 } , -+ { 0x2502 , (char)0xB3 } , { 0x250C , (char)0xDA } , { 0x2510 , (char)0xBF } , -+ { 0x2514 , (char)0xC0 } , { 0x2518 , (char)0xD9 } , { 0x251C , (char)0xC3 } , -+ { 0x252C , (char)0xC2 } , { 0x2534 , (char)0xC1 } , { 0x253C , (char)0xC5 } , -+ { 0x2580 , (char)0xDF } , { 0x2584 , (char)0xDC } , { 0x2588 , (char)0xDB } , -+ { 0x2591 , (char)0xB0 } , { 0x2592 , (char)0xB1 } , { 0x2593 , (char)0xB2 } , -+ { 0x25B2 , (char)0x1E } , { 0x25B6 , (char)0x10 } , { 0x25BC , (char)0x1F } , -+ { 0x25C0 , (char)0x11 } , { 0x263A , (char)0x01 } , { 0x263B , (char)0x02 } , -+ { 0x2660 , (char)0x06 } , { 0x2663 , (char)0x05 } , { 0x2665 , (char)0x03 } , -+ { 0x2666 , (char)0x04 } - }; - - static const cexcept exc2ibm852Array[] = - { -- { 0x02C7 , 0xF3 } , { 0x02D8 , 0xF4 } , { 0x02DB , 0xF2 } , -- { 0x02DD , 0xF1 } , { 0x20C3 , 0x13 } , { 0x2191 , 0x18 } , -- { 0x2192 , 0x1A } , { 0x2193 , 0x19 } , { 0x2194 , 0x1D } , -- { 0x2195 , 0x12 } , { 0x21A8 , 0x17 } , { 0x220E , 0xFE } , -- { 0x2219 , 0xFA } , { 0x2319 , 0x1C } , { 0x2500 , 0xC4 } , -- { 0x2502 , 0xB3 } , { 0x250C , 0xDA } , { 0x2510 , 0xBF } , -- { 0x2514 , 0xC0 } , { 0x2518 , 0xD9 } , { 0x251C , 0xC3 } , -- { 0x252C , 0xC2 } , { 0x2534 , 0xC1 } , { 0x253C , 0xC5 } , -- { 0x2580 , 0xDF } , { 0x2584 , 0xDC } , { 0x2588 , 0xDB } , -- { 0x2591 , 0xB0 } , { 0x2592 , 0xB1 } , { 0x2593 , 0xB2 } , -- { 0x25B2 , 0x1E } , { 0x25B6 , 0x10 } , { 0x25BC , 0x1F } , -- { 0x25C0 , 0x11 } , { 0x263A , 0x01 } , { 0x263B , 0x02 } , -- { 0x2660 , 0x06 } , { 0x2663 , 0x05 } , { 0x2665 , 0x03 } , -- { 0x2666 , 0x04 } -+ { 0x02C7 , (char)0xF3 } , { 0x02D8 , (char)0xF4 } , { 0x02DB , (char)0xF2 } , -+ { 0x02DD , (char)0xF1 } , { 0x20C3 , (char)0x13 } , { 0x2191 , (char)0x18 } , -+ { 0x2192 , (char)0x1A } , { 0x2193 , (char)0x19 } , { 0x2194 , (char)0x1D } , -+ { 0x2195 , (char)0x12 } , { 0x21A8 , (char)0x17 } , { 0x220E , (char)0xFE } , -+ { 0x2219 , (char)0xFA } , { 0x2319 , (char)0x1C } , { 0x2500 , (char)0xC4 } , -+ { 0x2502 , (char)0xB3 } , { 0x250C , (char)0xDA } , { 0x2510 , (char)0xBF } , -+ { 0x2514 , (char)0xC0 } , { 0x2518 , (char)0xD9 } , { 0x251C , (char)0xC3 } , -+ { 0x252C , (char)0xC2 } , { 0x2534 , (char)0xC1 } , { 0x253C , (char)0xC5 } , -+ { 0x2580 , (char)0xDF } , { 0x2584 , (char)0xDC } , { 0x2588 , (char)0xDB } , -+ { 0x2591 , (char)0xB0 } , { 0x2592 , (char)0xB1 } , { 0x2593 , (char)0xB2 } , -+ { 0x25B2 , (char)0x1E } , { 0x25B6 , (char)0x10 } , { 0x25BC , (char)0x1F } , -+ { 0x25C0 , (char)0x11 } , { 0x263A , (char)0x01 } , { 0x263B , (char)0x02 } , -+ { 0x2660 , (char)0x06 } , { 0x2663 , (char)0x05 } , { 0x2665 , (char)0x03 } , -+ { 0x2666 , (char)0x04 } - }; - - static const cexcept exc2ibm860Array[] = - { -- { 0xC0 , 0x91 } , { 0xC1 , 0x86 } , { 0xC2 , 0x8F }, { 0xC3 , 0x8E } , -- { 0xC8 , 0x92 } , { 0xC9 , 0x86 } , { 0xCA , 0x89 }, { 0xCC , 0x98 } , -- { 0xCD , 0x8B } , { 0xD2 , 0xA9 } , { 0xD3 , 0x9F }, { 0xD4 , 0x8C } , -- { 0xD5 , 0x99 } , { 0xD9 , 0x9D } , { 0xDA , 0x96 }, { 0xE3 , 0x84 } , -- { 0xF5 , 0x94 } -+ { 0xC0 , (char)0x91 } , { 0xC1 , (char)0x86 } , { 0xC2 , (char)0x8F }, { 0xC3 , (char)0x8E } , -+ { 0xC8 , (char)0x92 } , { 0xC9 , (char)0x86 } , { 0xCA , (char)0x89 }, { 0xCC , (char)0x98 } , -+ { 0xCD , (char)0x8B } , { 0xD2 , (char)0xA9 } , { 0xD3 , (char)0x9F }, { 0xD4 , (char)0x8C } , -+ { 0xD5 , (char)0x99 } , { 0xD9 , (char)0x9D } , { 0xDA , (char)0x96 }, { 0xE3 , (char)0x84 } , -+ { 0xF5 , (char)0x94 } - }; - - static const cexcept exc2ibm863Array[] = - { -- { 0xA4 , 0x98 } , { 0xA6 , 0xA0 } , { 0xA8 , 0xA4 }, { 0xAF , 0xA7 } , -- { 0xB3 , 0xA6 } , { 0xB4 , 0xA1 } , { 0xB8 , 0xA5 }, { 0xBE , 0xAD } , -- { 0xC0 , 0x8E } , { 0xC2 , 0x84 } , { 0xC8 , 0x91 }, { 0xCA , 0x92 } , -- { 0xCB , 0x94 } , { 0xCE , 0xA8 } , { 0xCF , 0x95 }, { 0xD4 , 0x99 } , -- { 0xD9 , 0x9D } , { 0xDB , 0x9E } , { 0xFA , 0x97 } -+ { 0xA4 , (char)0x98 } , { 0xA6 , (char)0xA0 } , { 0xA8 , (char)0xA4 }, { 0xAF , (char)0xA7 } , -+ { 0xB3 , (char)0xA6 } , { 0xB4 , (char)0xA1 } , { 0xB8 , (char)0xA5 }, { 0xBE , (char)0xAD } , -+ { 0xC0 , (char)0x8E } , { 0xC2 , (char)0x84 } , { 0xC8 , (char)0x91 }, { 0xCA , (char)0x92 } , -+ { 0xCB , (char)0x94 } , { 0xCE , (char)0xA8 } , { 0xCF , (char)0x95 }, { 0xD4 , (char)0x99 } , -+ { 0xD9 , (char)0x9D } , { 0xDB , (char)0x9E } , { 0xFA , (char)0x97 } - }; - - static const cexcept exc2ibm865Array[] = - { -- { 0xA4 , 0xAF } , { 0xFA , 0x97 } -+ { 0xA4 , (char)0xAF } , { 0xFA , (char)0x97 } - }; - - static const cexcept exc2winArray[] = - { -- { 0x0118 , 0x9F } , { 0x0152 , 0x8C } , { 0x0153 , 0x9C } , -- { 0x0160 , 0x8A } , { 0x0161 , 0x9A } , { 0x0192 , 0x83 } , -- { 0x02C6 , 0x88 } , { 0x02DC , 0x98 } , { 0x2013 , 0x96 } , -- { 0x2014 , 0x97 } , { 0x2018 , 0x91 } , { 0x2019 , 0x92 } , -- { 0x201A , 0x82 } , { 0x201C , 0x93 } , { 0x201D , 0x94 } , -- { 0x201E , 0x84 } , { 0x2020 , 0x86 } , { 0x2021 , 0x87 } , -- { 0x2026 , 0x85 } , { 0x2031 , 0x89 } , { 0x2039 , 0x8B } , -- { 0x20A0 , 0x9B } , { 0x2122 , 0x99 } , { 0x220F , 0x95 } -+ { 0x0118 , (char)0x9F } , { 0x0152 , (char)0x8C } , { 0x0153 , (char)0x9C } , -+ { 0x0160 , (char)0x8A } , { 0x0161 , (char)0x9A } , { 0x0192 , (char)0x83 } , -+ { 0x02C6 , (char)0x88 } , { 0x02DC , (char)0x98 } , { 0x2013 , (char)0x96 } , -+ { 0x2014 , (char)0x97 } , { 0x2018 , (char)0x91 } , { 0x2019 , (char)0x92 } , -+ { 0x201A , (char)0x82 } , { 0x201C , (char)0x93 } , { 0x201D , (char)0x94 } , -+ { 0x201E , (char)0x84 } , { 0x2020 , (char)0x86 } , { 0x2021 , (char)0x87 } , -+ { 0x2026 , (char)0x85 } , { 0x2031 , (char)0x89 } , { 0x2039 , (char)0x8B } , -+ { 0x20A0 , (char)0x9B } , { 0x2122 , (char)0x99 } , { 0x220F , (char)0x95 } - }; - - + 0xCD, 0xBA, 0xD5, 0xD6, /* 0x0250-0x0253 (9552-9555) */ + 0xC9, 0xB8, 0xB7, 0xBB, /* 0x0254-0x0257 (9556-9559) */ +-- +2.19.2 + |