From 01e0a777491a7d5bf48ea704df7bc0965d4e8883 Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 27 Jan 2004 23:26:26 +0000 Subject: 2004-01-27 Artem B. Bityuckiy * configure.in: Add support to generate iconv converter flags for newlib.h * newlib.hin: Add iconv converter flags. * configure: Regenerated. * libc/Makefile.in: Ditto. * libc/configure.in: Moved iconv converter parsing logic to top level newlib configure.in. * libc/configure: Regenerated. * libc/iconv/Makefile.in: Ditto. * libc/iconv/README.TODO * libc/iconv/charset.aliases: Remove wrong BE aliases for UCS2/UCS4/UTF8. * libc/iconv/ccs/Makefile.am: Remove C flag setting now that newlib.h can be used. * libc/iconv/ces/Makefile.am: Ditto. * libc/iconv/lib/Makefile.am: Ditto. * libc/iconv/ccs/Makefile.in: Regenerated. * libc/iconv/ces/Makefile.in: Ditto. * libc/iconv/lib/Makefile.in: Ditto. * libc/iconv/ccs/README.CCS.SOURCES: Updated. * libc/iconv/ccs/iconv_mktbl: Don't write junk strings to binaries. * libc/iconv/ccs/big5.c: Switch to use new underscored flags defined in newlib.h. * 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/gb_2312_80.c: Ditto. * libc/iconv/ccs/iso_8859_1.c: Ditto. * libc/iconv/ccs/iso_8859_15.c: Ditto. * libc/iconv/ccs/iso_8859_2.c: Ditto. * libc/iconv/ccs/iso_8859_4.c: Ditto. * libc/iconv/ccs/iso_8859_5.c: Ditto. * libc/iconv/ccs/jis_x0201.c: Ditto. * libc/iconv/ccs/jis_x0208_1983.c: Ditto. * libc/iconv/ccs/jis_x0212_1990.c: Ditto. * libc/iconv/ccs/koi8_r.c: Ditto. * libc/iconv/ccs/koi8_u.c: Ditto. * libc/iconv/ccs/ksx1001.c: Ditto. * libc/iconv/ccs/shift_jis.c: Ditto. * libc/iconv/ccs/us_ascii.c: Ditto. * libc/iconv/ccs/binary/big5.cct: Newly generated. * 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: Ditto. * libc/iconv/ccs/binary/cp850.cct: Ditto. * libc/iconv/ccs/binary/cp852.cct: Ditto. * libc/iconv/ccs/binary/cp855.cct: Ditto. * libc/iconv/ccs/binary/cp866.cct: Ditto. * libc/iconv/ccs/binary/gb_2312_80.cct: 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_2.cct: Ditto. * libc/iconv/ccs/binary/iso_8859_4.cct: Ditto. * libc/iconv/ccs/binary/iso_8859_5.cct: Ditto. * libc/iconv/ccs/binary/jis_x0201.cct: Ditto. * libc/iconv/ccs/binary/jis_x0208_1983.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/shift_jis.cct: Ditto. * libc/iconv/ccs/binary/us_ascii.cct: Ditto. * libc/iconv/lib/bialiasesi.c: Sync with charset.aliases. * libc/iconv/ces/euc-jp.c: Use newlib.h macros. * 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.c: Ditto. * libc/iconv/ces/iso-10646-ucs-4.c: Ditto. * libc/iconv/ces/ucs-2-internal.c: Ditto. * libc/iconv/ces/ucs-4-internal.c: Ditto. * libc/iconv/ces/utf-16.c: Ditto. * libc/iconv/ces/utf-8.c: Ditto. * libc/iconv/lib/aliases.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/endian.h: Ditto. * libc/iconv/lib/iconv.c: Ditto. * libc/iconv/lib/loaddata.c: Ditto. * libc/iconv/lib/local.h: Include newlib.h. * libc/argz/Makefile.in: Regenerated. * libc/ctype/Makefile.in: Ditto. * libc/errno/Makefile.in: Ditto. * libc/iconv/ccs/binary/Makefile.in: Ditto. * libc/locale/Makefile.in: Ditto. * libc/misc/Makefile.in: Ditto. * libc/posix/Makefile.in: Ditto. * libc/reent/Makefile.in: Ditto. * libc/search/Makefile.in: Ditto. * libc/signal/Makefile.in: Ditto. * libc/stdio/Makefile.in: Ditto. * libc/stdio64/Makefile.in: Ditto. * libc/stdlib/Makefile.in: Ditto. * libc/string/Makefile.in: Ditto. * libc/syscalls/Makefile.in: Ditto. * libc/time/Makefile.in: Ditto. * libc/unix/Makefile.in: Ditto. * testsuite/newlib.iconv/iconv.exp: New file. * testsuite/newlib.iconv/iconvjp.c: Ditto. * testsuite/newlib.iconv/iconvnm.c: Ditto. * testsuite/newlib.iconv/iconvru.c: Ditto. --- newlib/libc/iconv/lib/ces.c | 48 +++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 26 deletions(-) (limited to 'newlib/libc/iconv/lib/ces.c') diff --git a/newlib/libc/iconv/lib/ces.c b/newlib/libc/iconv/lib/ces.c index 1ac6174b3..b63b92712 100644 --- a/newlib/libc/iconv/lib/ces.c +++ b/newlib/libc/iconv/lib/ces.c @@ -25,9 +25,6 @@ * * iconv (Charset Conversion Library) v2.0 */ -#ifdef ENABLE_ICONV - -#include <_ansi.h> #include #include #include @@ -67,8 +64,8 @@ _DEFUN(ces_init_builtin, (rptr, ces, name), struct iconv_ces *ces _AND _CONST char *name) { - _CONST iconv_builtin_table *ces_ptr; - for (ces_ptr = iconv_builtin_ces; ces_ptr->key != NULL; ces_ptr ++) + _CONST iconv_builtin_table_t *ces_ptr; + for (ces_ptr = _iconv_builtin_ces; ces_ptr->key != NULL; ces_ptr ++) if (strcmp(ces_ptr->key, name) == 0) return ces_instance_init(rptr, ces, name, (_CONST struct iconv_ces_desc *)(ces_ptr->value)); @@ -76,21 +73,21 @@ _DEFUN(ces_init_builtin, (rptr, ces, name), } int -_DEFUN(iconv_ces_init, (rptr, ces, name), - struct _reent *rptr _AND - struct iconv_ces *ces _AND - _CONST char *name) +_DEFUN(_iconv_ces_init, (rptr, ces, name), + struct _reent *rptr _AND + struct iconv_ces *ces _AND + _CONST char *name) { return ces_init_builtin(rptr, ces, name) - && ces_instance_init(rptr, ces, name, &iconv_ces_table_driven); + && ces_instance_init(rptr, ces, name, &_iconv_ces_table_driven); } int -_DEFUN(iconv_ces_init_state, (rptr, res, name, data), - struct _reent *rptr _AND - _VOID_PTR *res _AND - _CONST char *name _AND - _CONST _VOID_PTR data) +_DEFUN(_iconv_ces_init_state, (rptr, res, name, data), + struct _reent *rptr _AND + _VOID_PTR *res _AND + _CONST char *name _AND + _CONST _VOID_PTR data) { if ((*res = _malloc_r(rptr, sizeof(int))) == NULL) return __errno_r(rptr); @@ -99,7 +96,7 @@ _DEFUN(iconv_ces_init_state, (rptr, res, name, data), } int -_DEFUN(iconv_ces_close_state, (rptr, data), +_DEFUN(_iconv_ces_close_state, (rptr, data), struct _reent *rptr _AND _VOID_PTR data) { @@ -109,23 +106,23 @@ _DEFUN(iconv_ces_close_state, (rptr, data), } _VOID -_DEFUN(iconv_ces_reset_state, (data), _VOID_PTR data) +_DEFUN(_iconv_ces_reset_state, (data), _VOID_PTR data) { *(int *)data = 0; } int -_DEFUN(iconv_ces_init_null, (rptr, res, name, data), - struct _reent *rptr _AND - _VOID_PTR *res _AND - _CONST char *name _AND - _CONST _VOID_PTR data) +_DEFUN(_iconv_ces_init_null, (rptr, res, name, data), + struct _reent *rptr _AND + _VOID_PTR *res _AND + _CONST char *name _AND + _CONST _VOID_PTR data) { return 0; } int -_DEFUN(iconv_ces_close_null, (rptr, data), +_DEFUN(_iconv_ces_close_null, (rptr, data), struct _reent *rptr _AND _VOID_PTR data) { @@ -133,9 +130,8 @@ _DEFUN(iconv_ces_close_null, (rptr, data), } _VOID -_DEFUN(iconv_ces_reset_null, (data), _VOID_PTR data) +_DEFUN(_iconv_ces_reset_null, (data), _VOID_PTR data) { + return; } -#endif /* #ifdef ENABLE_ICONV */ - -- cgit v1.2.3