aboutsummaryrefslogtreecommitdiff
path: root/iconvdata
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-20 09:16:41 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-20 09:16:41 +0000
commit17427edd1fc510ae6eb7903cc8664e15500490d6 (patch)
tree0c0e4922611172e6ab93ee76dd882902eeee7d82 /iconvdata
parent1eab136137fe8b27f7c8ef2d4bee4c07c1821be3 (diff)
downloadglibc-17427edd1fc510ae6eb7903cc8664e15500490d6.tar
glibc-17427edd1fc510ae6eb7903cc8664e15500490d6.tar.gz
glibc-17427edd1fc510ae6eb7903cc8664e15500490d6.tar.bz2
glibc-17427edd1fc510ae6eb7903cc8664e15500490d6.zip
Update.
2000-11-20 Ulrich Drepper <drepper@redhat.com> * csu/gmon-start.c: Always have prototype for __gmon_start. * csu/version.c: Add prototypes for __libc_print_version and __libc_main. * iconv/gconv.c: Include gconv_int.h and gconv.h. * iconv/gconv.h (struct __gconv_step): Remove const from __from_name and __to_name. * iconv/gconv_builtin.h: Add ASCII module definitions. * iconv/gconv_conf.c (__gconv_path_elem): Remove const. (add_module): Add cast to avoid warning. Rework construction of strings for new module. * iconv/gconv_db.c (__gconv_alias_compare): Make s1 and s2 const. (derivation_compare): Likewise. * iconv/gconv_dl.c (do_release_shlib): Remove const from nodep. (__gconv_release_shlib): Cast do_release_shlib as parameter for twalk. * iconv/gconv_int.h (__gconv_path_elem): Remove const. (struct gconv_alias): Remove const from fromname and toname. * iconv/gconv_simple.c: Include gconv_builtin.h to get prototypes for loop functions. (internal_ucs4_loop): Use correct const-ness. (ucs4_internal_loop): Likewise. (internal_ucs4le_loop): Likewise. (ucs4le_internal_loop_single): Likewise. * iconv/gconv_trans.c (__gconv_transliterate): Make from_idx, from_tbl, to_idx, to_tbl, winbuf, winbufend const. Change casts in assignments appropriately. (struct known_trans): Remove const from fname. (trans_compare): Make s1 and s2 const. * iconv/loop.c (LOOPFC): Make outend parameter const. Add cast to avoid warning. * iconv/skeleton.c: Remove cast in calls of loop functions. * iconvdata/gconv-modules: Remove US-ASCII definitions. * iconvdata/iso646.c: Remove US_ASCII support. * include/set-hooks.h (DEFINE_HOOK): Also generate prototype. * include/unistd.h: Add __libc_check_standard_fds prototype. * string/bits/string2.h (__mempcpy_args): Add const to casts. * sysdeps/generic/initfini.c: Add prototypes for dummy, _init, and _fini. * sysdeps/generic/libc-start.c: Add prototype for __libc_start_main. * sysdeps/i386/i486/bits/string.h (strcmp): Add const to casts. * sysdeps/unix/sysv/linux/dl-osinfo.h (dl_fatal): Add cast to avoid warning. * sysdeps/unix/sysv/linux/init-first.c: Add prototypes for __libc_init_first and _dl_start. * sysdeps/unix/sysv/linux/mips/clone.S: Fix comments.
Diffstat (limited to 'iconvdata')
-rw-r--r--iconvdata/gconv-modules16
-rw-r--r--iconvdata/iso646.c2
2 files changed, 0 insertions, 18 deletions
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index 0aa334cced..021dd78448 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -33,22 +33,6 @@
# alias: alias name which is not really recognized.
# name: the real name of the character set
-# from to module cost
-alias ANSI_X3.4// ANSI_X3.4-1968//
-alias ISO-IR-6// ANSI_X3.4-1968//
-alias ANSI_X3.4-1986// ANSI_X3.4-1968//
-alias ISO_646.IRV:1991// ANSI_X3.4-1968//
-alias ASCII// ANSI_X3.4-1968//
-alias ISO646-US// ANSI_X3.4-1968//
-alias US-ASCII// ANSI_X3.4-1968//
-alias US// ANSI_X3.4-1968//
-alias IBM367// ANSI_X3.4-1968//
-alias CP367// ANSI_X3.4-1968//
-alias CSASCII// ANSI_X3.4-1968//
-alias OSF00010020// ANSI_X3.4-1968//
-module ANSI_X3.4-1968// INTERNAL ISO646 2
-module INTERNAL ANSI_X3.4-1968// ISO646 2
-
alias ISO-IR-4// BS_4730//
alias ISO646-GB// BS_4730//
alias GB// BS_4730//
diff --git a/iconvdata/iso646.c b/iconvdata/iso646.c
index d26ed5e3e4..4cfd98c106 100644
--- a/iconvdata/iso646.c
+++ b/iconvdata/iso646.c
@@ -62,7 +62,6 @@ enum direction
enum variant
{
illegal_var,
- US, /* ANSI_X3.4-1968 */
GB, /* BS_4730 */
CA, /* CSA_Z243.4-1985-1 */
CA2, /* CSA_Z243.4-1985-2 */
@@ -90,7 +89,6 @@ enum variant
static const char *names[] =
{
- [US] = "ANSI_X3.4-1968//",
[GB] = "BS_4730//",
[CA] = "CSA_Z243.4-1985-1//",
[CA2] = "CSA_Z243.4-1985-2//",