2004-06-25 Artem B. Bityuckiy <dedekind@oktetlabs.ru>

	* acinclude.m4: Move iconv options into configure.in.
	* aclocal.m4: Regenerated.
	* configure: Ditto.
	* configure.in: Add iconv options.
	* newlib.hin: Add new iconv encodings and remove deleted ones.
	* doc/aclocal.m4: Regenerated.
	* doc/configure: Ditto.
	* iconvdata/aclocal.m4: Ditto.
	* iconvdata/configure: Ditto.
	* libc/iconv: Design change.  New size-optimized ccs format.
	* libc/iconv/AUTHORS: Removed.
	* libc/iconv/COPYING: Ditto.
	* libc/iconv/README.ORIGINAL: Ditto.
	* libc/iconv/README.TODO: Ditto.
	* libc/iconv/charset.aliases: Ditto.
	* libc/iconv/encoding.aliases: New file.
	* libc/iconv/Makefile.am: Updated.
	* libc/iconv/Makefile.in: Regenerated.
	* libc/iconv/iconv.tex: Updated.
	* libc/iconv/ccs/Makefile.am: Ditto.
	* libc/iconv/ccs/Makefile.in: Regenerated.
	* libc/iconv/ccs/big5.c: Updated.
	* libc/iconv/ccs/cns11643_plane1.c: Ditto.
	* libc/iconv/ccs/cns11643_plane14.c: Ditto.
	* libc/iconv/ccs/cns11643_plane2.c: Ditto.
	* libc/iconv/ccs/cp775.c: Ditto.
	* libc/iconv/ccs/cp850.c: Ditto.
	* libc/iconv/ccs/cp852.c: Ditto.
	* libc/iconv/ccs/cp855.c: Ditto.
	* libc/iconv/ccs/cp866.c: Ditto.
	* libc/iconv/ccs/iso_8859_1.c: Ditto.
	* libc/iconv/ccs/README.CCS.SOURCES: Removed.
	* libc/iconv/ccs/gb_2312_80.c: Ditto.
	* libc/iconv/ccs/iconv_mktbl: Ditto.
	* libc/iconv/ccs/jis_x0201.c: Ditto.
	* libc/iconv/ccs/jis_x0208_1983.c: Ditto.
	* libc/iconv/ccs/shift_jis.c: Ditto.
	* libc/iconv/ccs/us_ascii.c: Ditto.
	* libc/iconv/ccs/ccs.h: New file.
	* libc/iconv/ccs/ccsbi.c: Ditto.
	* libc/iconv/ccs/ccsbi.h: Ditto.
	* libc/iconv/ccs/ccsnames.h: Ditto.
	* libc/iconv/ccs/iso_8859_10.c: Ditto.
	* libc/iconv/ccs/iso_8859_11.c: Ditto.
	* libc/iconv/ccs/iso_8859_13.c: Ditto.
	* libc/iconv/ccs/iso_8859_14.c: Ditto.
	* libc/iconv/ccs/iso_8859_3.c: Ditto.
	* libc/iconv/ccs/iso_8859_6.c: Ditto.
	* libc/iconv/ccs/iso_8859_7.c: Ditto.
	* libc/iconv/ccs/iso_8859_8.c: Ditto.
	* libc/iconv/ccs/iso_8859_9.c: Ditto.
	* libc/iconv/ccs/iso_ir_111.c: Ditto.
	* libc/iconv/ccs/jis_x0201_1976.c: Ditto.
	* libc/iconv/ccs/jis_x0208_1990.c: Ditto.
	* libc/iconv/ccs/koi8_ru.c: Ditto.
	* libc/iconv/ccs/koi8_uni.c: Ditto.
	* libc/iconv/ccs/mktbl.pl: Ditto.
	* libc/iconv/ccs/win_1250.c: Ditto.
	* libc/iconv/ccs/win_1251.c: Ditto.
	* libc/iconv/ccs/win_1252.c: Ditto.
	* libc/iconv/ccs/win_1253.c: Ditto.
	* libc/iconv/ccs/win_1254.c: Ditto.
	* libc/iconv/ccs/win_1255.c: Ditto.
	* libc/iconv/ccs/win_1256.c: Ditto.
	* libc/iconv/ccs/win_1257.c: Ditto.
	* libc/iconv/ccs/win_1258.c: Ditto.
	* libc/iconv/ccs/iso_8859_15.c
	* libc/iconv/ccs/iso_8859_2.c
	* libc/iconv/ccs/iso_8859_4.c
	* libc/iconv/ccs/iso_8859_5.c
	* libc/iconv/ccs/jis_x0212_1990.c
	* libc/iconv/ccs/koi8_r.c
	* libc/iconv/ccs/koi8_u.c
	* libc/iconv/ccs/ksx1001.c
	* libc/iconv/ccs/binary/gb_2312_80.cct: Removed.
	* libc/iconv/ccs/binary/jis_x0201.cct: Ditto.
	* libc/iconv/ccs/binary/shift_jis.cct: Ditto.
	* libc/iconv/ccs/binary/us_ascii.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0208_1983.cct: Ditto.
	* libc/iconv/ccs/binary/Makefile.am: Updated.
	* libc/iconv/ccs/binary/Makefile.in: Regenerated.
	* libc/iconv/ccs/binary/big5.cct: Updated.
	* libc/iconv/ccs/binary/cns11643_plane1.cct: Ditto.
	* libc/iconv/ccs/binary/cns11643_plane14.cct: Ditto.
	* libc/iconv/ccs/binary/cns11643_plane2.cct: Ditto.
	* libc/iconv/ccs/binary/cp775.cct: Updated.: Ditto.
	* libc/iconv/ccs/binary/cp850.cct: Ditto.: Ditto.
	* libc/iconv/ccs/binary/cp852.cct: Ditto.: Ditto.
	* libc/iconv/ccs/binary/cp855.cct: Ditto.: Ditto.
	* libc/iconv/ccs/binary/cp866.cct: Ditto.: Ditto.
	* libc/iconv/ccs/binary/iso_8859_1.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_15.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_4.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_5.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_2.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0212_1990.cct: Ditto.
	* libc/iconv/ccs/binary/koi8_r.cct: Ditto.
	* libc/iconv/ccs/binary/koi8_u.cct: Ditto.
	* libc/iconv/ccs/binary/ksx1001.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_10.cct: New file.
	* libc/iconv/ccs/binary/iso_8859_11.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_13.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_14.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_3.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_6.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_7.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_8.cct: Ditto.
	* libc/iconv/ccs/binary/iso_8859_9.cct: Ditto.
	* libc/iconv/ccs/binary/iso_ir_111.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0201_1976.cct: Ditto.
	* libc/iconv/ccs/binary/jis_x0208_1990.cct: Ditto.
	* libc/iconv/ccs/binary/koi8_ru.cct: Ditto.
	* libc/iconv/ccs/binary/koi8_uni.cct: Ditto.
	* libc/iconv/ccs/binary/win_1250.cct: Ditto.
	* libc/iconv/ccs/binary/win_1251.cct: Ditto.
	* libc/iconv/ccs/binary/win_1252.cct: Ditto.
	* libc/iconv/ccs/binary/win_1253.cct: Ditto.
	* libc/iconv/ccs/binary/win_1254.cct: Ditto.
	* libc/iconv/ccs/binary/win_1255.cct: Ditto.
	* libc/iconv/ccs/binary/win_1256.cct: Ditto.
	* libc/iconv/ccs/binary/win_1257.cct: Ditto.
	* libc/iconv/ccs/binary/win_1258.cct: Ditto.
	* libc/iconv/ces/Makefile.am: Updated.
	* libc/iconv/ces/Makefile.in: Regenerated.
	* libc/iconv/ces/ucs-2-internal.c: Updated.
	* libc/iconv/ces/ucs-4-internal.c: Ditto.
	* libc/iconv/ces/utf-16.c: Ditto.
	* libc/iconv/ces/utf-8.c: Ditto.
	* libc/iconv/ces/cesbi.c: New file.
	* libc/iconv/ces/cesbi.h: Ditto.
	* libc/iconv/ces/cesdeps.h: Ditto.
	* libc/iconv/ces/euc.c: Ditto.
	* libc/iconv/ces/mkdeps.pl: Ditto.
	* libc/iconv/ces/table-pcs.c: Ditto.
	* libc/iconv/ces/table.c: Ditto.
	* libc/iconv/ces/ucs-2.c: Ditto.
	* libc/iconv/ces/ucs-4.c: Ditto.
	* libc/iconv/ces/us-ascii.c: Ditto.
	* libc/iconv/ces/euc-jp.c: Removed.
	* libc/iconv/ces/euc-kr.c: Ditto.
	* libc/iconv/ces/euc-tw.c: Ditto.
	* libc/iconv/ces/gb2312.c: Ditto.
	* libc/iconv/ces/iso-10646-ucs-2.: Ditto.c
	* libc/iconv/ces/iso-10646-ucs-4.c: Ditto.
	* libc/iconv/lib/Makefile.am: Updated.
	* libc/iconv/lib/Makefile.in: Regenerated.
	* libc/iconv/lib/endian.h: Updated.
	* libc/iconv/lib/iconv.c: Ditto.
	* libc/iconv/lib/local.h: Ditto.
	* libc/iconv/lib/aliases.c: Removed.
	* libc/iconv/lib/bialiasesi.c: Ditto.
	* libc/iconv/lib/biccs.c: Ditto.
	* libc/iconv/lib/bices.c: Ditto.
	* libc/iconv/lib/ccs.c: Ditto.
	* libc/iconv/lib/ces.c: Ditto.
	* libc/iconv/lib/ces_euc.c: Ditto.
	* libc/iconv/lib/ces_iso2022.c: Ditto.
	* libc/iconv/lib/ces_table.c: Ditto.
	* libc/iconv/lib/converter.c: Ditto.
	* libc/iconv/lib/deps.h: Ditto.
	* libc/iconv/lib/aliasesbi.c: Ditto.
	* libc/iconv/lib/aliasesi.c: Ditto.
	* libc/iconv/lib/conv.h: Ditto.
	* libc/iconv/lib/encnames.h: Ditto.
	* libc/iconv/lib/encoding.deps: Ditto.
	* libc/iconv/lib/iconvnls.c: Ditto.
	* libc/iconv/lib/iconvnls.h: Ditto.
	* libc/iconv/lib/loaddata.c: Ditto.
	* libc/iconv/lib/nullconv.c: Ditto.
	* libc/iconv/lib/ucsconv.c: Ditto.
	* libc/iconv/lib/ucsconv.h: Ditto.
	* libc/include/iconv.h: Update copyright.
	* libc/*/aclocal.m4: Regenerated.
	* libc/*/configure: Ditto.
	* libm/*/aclocal.m4: Ditto.
	* libm/*/configure: Ditto.

1 files changed, 401 insertions, 0 deletions

diff --git a/newlib/libc/iconv/ces/cesbi.c b/newlib/libc/iconv/ces/cesbi.c
new file mode 100644
index 000000000..c2e6520a3
--- /dev/null
+++ b/newlib/libc/iconv/ces/cesbi.c
@@ -0,0 +1,401 @@
+/*
+ * This file was automatically generated mkdeps.pl script. Don't edit.
+ */
+
+#include <_ansi.h>
+#include <newlib.h>
+#include "../lib/ucsconv.h"
+#include "cesbi.h"
+
+/*
+ * Each CES converter provides the list of supported encodings.
+ */
+#if defined (ICONV_TO_UCS_CES_EUC) \
+ || defined (ICONV_FROM_UCS_CES_EUC)
+static _CONST char *
+iconv_ces_names_euc[] =
+{
+# if defined (_ICONV_FROM_ENCODING_EUC_JP) \
+  || defined (_ICONV_TO_ENCODING_EUC_JP)
+  ICONV_ENCODING_EUC_JP,
+#endif
+# if defined (_ICONV_FROM_ENCODING_EUC_KR) \
+  || defined (_ICONV_TO_ENCODING_EUC_KR)
+  ICONV_ENCODING_EUC_KR,
+#endif
+# if defined (_ICONV_FROM_ENCODING_EUC_TW) \
+  || defined (_ICONV_TO_ENCODING_EUC_TW)
+  ICONV_ENCODING_EUC_TW,
+#endif
+  NULL
+};
+#endif
+
+#if defined (ICONV_TO_UCS_CES_TABLE) \
+ || defined (ICONV_FROM_UCS_CES_TABLE)
+static _CONST char *
+iconv_ces_names_table[] =
+{
+# if defined (_ICONV_FROM_ENCODING_CP775) \
+  || defined (_ICONV_TO_ENCODING_CP775)
+  ICONV_ENCODING_CP775,
+#endif
+# if defined (_ICONV_FROM_ENCODING_CP850) \
+  || defined (_ICONV_TO_ENCODING_CP850)
+  ICONV_ENCODING_CP850,
+#endif
+# if defined (_ICONV_FROM_ENCODING_CP852) \
+  || defined (_ICONV_TO_ENCODING_CP852)
+  ICONV_ENCODING_CP852,
+#endif
+# if defined (_ICONV_FROM_ENCODING_CP855) \
+  || defined (_ICONV_TO_ENCODING_CP855)
+  ICONV_ENCODING_CP855,
+#endif
+# if defined (_ICONV_FROM_ENCODING_CP866) \
+  || defined (_ICONV_TO_ENCODING_CP866)
+  ICONV_ENCODING_CP866,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_1) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_1)
+  ICONV_ENCODING_ISO_8859_1,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_10) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_10)
+  ICONV_ENCODING_ISO_8859_10,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_11) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_11)
+  ICONV_ENCODING_ISO_8859_11,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_13) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_13)
+  ICONV_ENCODING_ISO_8859_13,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_14) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_14)
+  ICONV_ENCODING_ISO_8859_14,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_15) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_15)
+  ICONV_ENCODING_ISO_8859_15,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_2) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_2)
+  ICONV_ENCODING_ISO_8859_2,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_3) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_3)
+  ICONV_ENCODING_ISO_8859_3,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_4) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_4)
+  ICONV_ENCODING_ISO_8859_4,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_5) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_5)
+  ICONV_ENCODING_ISO_8859_5,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_6) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_6)
+  ICONV_ENCODING_ISO_8859_6,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_7) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_7)
+  ICONV_ENCODING_ISO_8859_7,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_8) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_8)
+  ICONV_ENCODING_ISO_8859_8,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_8859_9) \
+  || defined (_ICONV_TO_ENCODING_ISO_8859_9)
+  ICONV_ENCODING_ISO_8859_9,
+#endif
+# if defined (_ICONV_FROM_ENCODING_ISO_IR_111) \
+  || defined (_ICONV_TO_ENCODING_ISO_IR_111)
+  ICONV_ENCODING_ISO_IR_111,
+#endif
+# if defined (_ICONV_FROM_ENCODING_KOI8_R) \
+  || defined (_ICONV_TO_ENCODING_KOI8_R)
+  ICONV_ENCODING_KOI8_R,
+#endif
+# if defined (_ICONV_FROM_ENCODING_KOI8_RU) \
+  || defined (_ICONV_TO_ENCODING_KOI8_RU)
+  ICONV_ENCODING_KOI8_RU,
+#endif
+# if defined (_ICONV_FROM_ENCODING_KOI8_U) \
+  || defined (_ICONV_TO_ENCODING_KOI8_U)
+  ICONV_ENCODING_KOI8_U,
+#endif
+# if defined (_ICONV_FROM_ENCODING_KOI8_UNI) \
+  || defined (_ICONV_TO_ENCODING_KOI8_UNI)
+  ICONV_ENCODING_KOI8_UNI,
+#endif
+# if defined (_ICONV_FROM_ENCODING_WIN_1250) \
+  || defined (_ICONV_TO_ENCODING_WIN_1250)
+  ICONV_ENCODING_WIN_1250,
+#endif
+# if defined (_ICONV_FROM_ENCODING_WIN_1251) \
+  || defined (_ICONV_TO_ENCODING_WIN_1251)
+  ICONV_ENCODING_WIN_1251,
+#endif
+# if defined (_ICONV_FROM_ENCODING_WIN_1252) \
+  || defined (_ICONV_TO_ENCODING_WIN_1252)
+  ICONV_ENCODING_WIN_1252,
+#endif
+# if defined (_ICONV_FROM_ENCODING_WIN_1253) \
+  || defined (_ICONV_TO_ENCODING_WIN_1253)
+  ICONV_ENCODING_WIN_1253,
+#endif
+# if defined (_ICONV_FROM_ENCODING_WIN_1254) \
+  || defined (_ICONV_TO_ENCODING_WIN_1254)
+  ICONV_ENCODING_WIN_1254,
+#endif
+# if defined (_ICONV_FROM_ENCODING_WIN_1255) \
+  || defined (_ICONV_TO_ENCODING_WIN_1255)
+  ICONV_ENCODING_WIN_1255,
+#endif
+# if defined (_ICONV_FROM_ENCODING_WIN_1256) \
+  || defined (_ICONV_TO_ENCODING_WIN_1256)
+  ICONV_ENCODING_WIN_1256,
+#endif
+# if defined (_ICONV_FROM_ENCODING_WIN_1257) \
+  || defined (_ICONV_TO_ENCODING_WIN_1257)
+  ICONV_ENCODING_WIN_1257,
+#endif
+# if defined (_ICONV_FROM_ENCODING_WIN_1258) \
+  || defined (_ICONV_TO_ENCODING_WIN_1258)
+  ICONV_ENCODING_WIN_1258,
+#endif
+  NULL
+};
+#endif
+
+#if defined (ICONV_TO_UCS_CES_TABLE_PCS) \
+ || defined (ICONV_FROM_UCS_CES_TABLE_PCS)
+static _CONST char *
+iconv_ces_names_table_pcs[] =
+{
+# if defined (_ICONV_FROM_ENCODING_BIG5) \
+  || defined (_ICONV_TO_ENCODING_BIG5)
+  ICONV_ENCODING_BIG5,
+#endif
+  NULL
+};
+#endif
+
+#if defined (ICONV_TO_UCS_CES_UCS_2) \
+ || defined (ICONV_FROM_UCS_CES_UCS_2)
+static _CONST char *
+iconv_ces_names_ucs_2[] =
+{
+# if defined (_ICONV_FROM_ENCODING_UCS_2) \
+  || defined (_ICONV_TO_ENCODING_UCS_2)
+  ICONV_ENCODING_UCS_2,
+#endif
+# if defined (_ICONV_FROM_ENCODING_UCS_2BE) \
+  || defined (_ICONV_TO_ENCODING_UCS_2BE)
+  ICONV_ENCODING_UCS_2BE,
+#endif
+# if defined (_ICONV_FROM_ENCODING_UCS_2LE) \
+  || defined (_ICONV_TO_ENCODING_UCS_2LE)
+  ICONV_ENCODING_UCS_2LE,
+#endif
+  NULL
+};
+#endif
+
+#if defined (ICONV_TO_UCS_CES_UCS_2_INTERNAL) \
+ || defined (ICONV_FROM_UCS_CES_UCS_2_INTERNAL)
+static _CONST char *
+iconv_ces_names_ucs_2_internal[] =
+{
+# if defined (_ICONV_FROM_ENCODING_UCS_2_INTERNAL) \
+  || defined (_ICONV_TO_ENCODING_UCS_2_INTERNAL)
+  ICONV_ENCODING_UCS_2_INTERNAL,
+#endif
+  NULL
+};
+#endif
+
+#if defined (ICONV_TO_UCS_CES_UCS_4) \
+ || defined (ICONV_FROM_UCS_CES_UCS_4)
+static _CONST char *
+iconv_ces_names_ucs_4[] =
+{
+# if defined (_ICONV_FROM_ENCODING_UCS_4) \
+  || defined (_ICONV_TO_ENCODING_UCS_4)
+  ICONV_ENCODING_UCS_4,
+#endif
+# if defined (_ICONV_FROM_ENCODING_UCS_4BE) \
+  || defined (_ICONV_TO_ENCODING_UCS_4BE)
+  ICONV_ENCODING_UCS_4BE,
+#endif
+# if defined (_ICONV_FROM_ENCODING_UCS_4LE) \
+  || defined (_ICONV_TO_ENCODING_UCS_4LE)
+  ICONV_ENCODING_UCS_4LE,
+#endif
+  NULL
+};
+#endif
+
+#if defined (ICONV_TO_UCS_CES_UCS_4_INTERNAL) \
+ || defined (ICONV_FROM_UCS_CES_UCS_4_INTERNAL)
+static _CONST char *
+iconv_ces_names_ucs_4_internal[] =
+{
+# if defined (_ICONV_FROM_ENCODING_UCS_4_INTERNAL) \
+  || defined (_ICONV_TO_ENCODING_UCS_4_INTERNAL)
+  ICONV_ENCODING_UCS_4_INTERNAL,
+#endif
+  NULL
+};
+#endif
+
+#if defined (ICONV_TO_UCS_CES_US_ASCII) \
+ || defined (ICONV_FROM_UCS_CES_US_ASCII)
+static _CONST char *
+iconv_ces_names_us_ascii[] =
+{
+# if defined (_ICONV_FROM_ENCODING_US_ASCII) \
+  || defined (_ICONV_TO_ENCODING_US_ASCII)
+  ICONV_ENCODING_US_ASCII,
+#endif
+  NULL
+};
+#endif
+
+#if defined (ICONV_TO_UCS_CES_UTF_16) \
+ || defined (ICONV_FROM_UCS_CES_UTF_16)
+static _CONST char *
+iconv_ces_names_utf_16[] =
+{
+# if defined (_ICONV_FROM_ENCODING_UTF_16) \
+  || defined (_ICONV_TO_ENCODING_UTF_16)
+  ICONV_ENCODING_UTF_16,
+#endif
+# if defined (_ICONV_FROM_ENCODING_UTF_16BE) \
+  || defined (_ICONV_TO_ENCODING_UTF_16BE)
+  ICONV_ENCODING_UTF_16BE,
+#endif
+# if defined (_ICONV_FROM_ENCODING_UTF_16LE) \
+  || defined (_ICONV_TO_ENCODING_UTF_16LE)
+  ICONV_ENCODING_UTF_16LE,
+#endif
+  NULL
+};
+#endif
+
+#if defined (ICONV_TO_UCS_CES_UTF_8) \
+ || defined (ICONV_FROM_UCS_CES_UTF_8)
+static _CONST char *
+iconv_ces_names_utf_8[] =
+{
+# if defined (_ICONV_FROM_ENCODING_UTF_8) \
+  || defined (_ICONV_TO_ENCODING_UTF_8)
+  ICONV_ENCODING_UTF_8,
+#endif
+  NULL
+};
+#endif
+
+/*
+ * The following structure contains the list of "to UCS" linked-in CES converters.
+ */
+_CONST iconv_to_ucs_ces_t
+_iconv_to_ucs_ces[] =
+{
+#ifdef ICONV_TO_UCS_CES_EUC
+  {(_CONST char **)iconv_ces_names_euc,
+   &_iconv_to_ucs_ces_handlers_euc},
+#endif
+#ifdef ICONV_TO_UCS_CES_TABLE
+  {(_CONST char **)iconv_ces_names_table,
+   &_iconv_to_ucs_ces_handlers_table},
+#endif
+#ifdef ICONV_TO_UCS_CES_TABLE_PCS
+  {(_CONST char **)iconv_ces_names_table_pcs,
+   &_iconv_to_ucs_ces_handlers_table_pcs},
+#endif
+#ifdef ICONV_TO_UCS_CES_UCS_2
+  {(_CONST char **)iconv_ces_names_ucs_2,
+   &_iconv_to_ucs_ces_handlers_ucs_2},
+#endif
+#ifdef ICONV_TO_UCS_CES_UCS_2_INTERNAL
+  {(_CONST char **)iconv_ces_names_ucs_2_internal,
+   &_iconv_to_ucs_ces_handlers_ucs_2_internal},
+#endif
+#ifdef ICONV_TO_UCS_CES_UCS_4
+  {(_CONST char **)iconv_ces_names_ucs_4,
+   &_iconv_to_ucs_ces_handlers_ucs_4},
+#endif
+#ifdef ICONV_TO_UCS_CES_UCS_4_INTERNAL
+  {(_CONST char **)iconv_ces_names_ucs_4_internal,
+   &_iconv_to_ucs_ces_handlers_ucs_4_internal},
+#endif
+#ifdef ICONV_TO_UCS_CES_US_ASCII
+  {(_CONST char **)iconv_ces_names_us_ascii,
+   &_iconv_to_ucs_ces_handlers_us_ascii},
+#endif
+#ifdef ICONV_TO_UCS_CES_UTF_16
+  {(_CONST char **)iconv_ces_names_utf_16,
+   &_iconv_to_ucs_ces_handlers_utf_16},
+#endif
+#ifdef ICONV_TO_UCS_CES_UTF_8
+  {(_CONST char **)iconv_ces_names_utf_8,
+   &_iconv_to_ucs_ces_handlers_utf_8},
+#endif
+  {(_CONST char **)NULL,
+  (iconv_to_ucs_ces_handlers_t *)NULL}
+};
+
+/*
+ * The following structure contains the list of "from UCS" linked-in CES converters.
+ */
+_CONST iconv_from_ucs_ces_t
+_iconv_from_ucs_ces[] =
+{
+#ifdef ICONV_FROM_UCS_CES_EUC
+  {(_CONST char **)iconv_ces_names_euc,
+   &_iconv_from_ucs_ces_handlers_euc},
+#endif
+#ifdef ICONV_FROM_UCS_CES_TABLE
+  {(_CONST char **)iconv_ces_names_table,
+   &_iconv_from_ucs_ces_handlers_table},
+#endif
+#ifdef ICONV_FROM_UCS_CES_TABLE_PCS
+  {(_CONST char **)iconv_ces_names_table_pcs,
+   &_iconv_from_ucs_ces_handlers_table_pcs},
+#endif
+#ifdef ICONV_FROM_UCS_CES_UCS_2
+  {(_CONST char **)iconv_ces_names_ucs_2,
+   &_iconv_from_ucs_ces_handlers_ucs_2},
+#endif
+#ifdef ICONV_FROM_UCS_CES_UCS_2_INTERNAL
+  {(_CONST char **)iconv_ces_names_ucs_2_internal,
+   &_iconv_from_ucs_ces_handlers_ucs_2_internal},
+#endif
+#ifdef ICONV_FROM_UCS_CES_UCS_4
+  {(_CONST char **)iconv_ces_names_ucs_4,
+   &_iconv_from_ucs_ces_handlers_ucs_4},
+#endif
+#ifdef ICONV_FROM_UCS_CES_UCS_4_INTERNAL
+  {(_CONST char **)iconv_ces_names_ucs_4_internal,
+   &_iconv_from_ucs_ces_handlers_ucs_4_internal},
+#endif
+#ifdef ICONV_FROM_UCS_CES_US_ASCII
+  {(_CONST char **)iconv_ces_names_us_ascii,
+   &_iconv_from_ucs_ces_handlers_us_ascii},
+#endif
+#ifdef ICONV_FROM_UCS_CES_UTF_16
+  {(_CONST char **)iconv_ces_names_utf_16,
+   &_iconv_from_ucs_ces_handlers_utf_16},
+#endif
+#ifdef ICONV_FROM_UCS_CES_UTF_8
+  {(_CONST char **)iconv_ces_names_utf_8,
+   &_iconv_from_ucs_ces_handlers_utf_8},
+#endif
+  {(_CONST char **)NULL,
+  (iconv_from_ucs_ces_handlers_t *)NULL}
+};