aboutsummaryrefslogtreecommitdiff
path: root/iconv/gconv_builtin.h
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>1998-04-01 13:19:51 +0000
committerUlrich Drepper <drepper@redhat.com>1998-04-01 13:19:51 +0000
commit5891046a8615390bd96fb3cf1c4663bf00d12e47 (patch)
tree9bf6842ab437a66a259d909737ab6c1d8ad8b478 /iconv/gconv_builtin.h
parentf9f219d99a5b3b29af184bff9afe70aa9ed427a1 (diff)
downloadglibc-5891046a8615390bd96fb3cf1c4663bf00d12e47.tar
glibc-5891046a8615390bd96fb3cf1c4663bf00d12e47.tar.gz
glibc-5891046a8615390bd96fb3cf1c4663bf00d12e47.tar.bz2
glibc-5891046a8615390bd96fb3cf1c4663bf00d12e47.zip
Update.
* iconv/gconv_conf.c (builtin_aliases): New variable. (__gconv_read_conf): Add builtin aliases. * iconv/gconv_builtin.c (builtin_map): Define BUILTIN?ALIAS as an noop macro before including gconv_builtin.h. * iconv/gconv_builtin.h: Add alias names.
Diffstat (limited to 'iconv/gconv_builtin.h')
-rw-r--r--iconv/gconv_builtin.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/iconv/gconv_builtin.h b/iconv/gconv_builtin.h
index 8dcc3aaaa2..3990b2cdb3 100644
--- a/iconv/gconv_builtin.h
+++ b/iconv/gconv_builtin.h
@@ -1,5 +1,5 @@
/* Builtin transformations.
- Copyright (C) 1997 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1998 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -18,13 +18,16 @@
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
+BUILTIN_ALIAS ("UTF8//", "ISO-10646/UTF8/")
+BUILTIN_ALIAS ("UTF-8//", "ISO-10646/UTF8/")
+
BUILTIN_TRANSFORMATION ("([^/]+)/UCS4/([^/]*)", NULL, 0,
"\\1/UTF8/\\2", 1, "=ucs4->utf8",
__gconv_transform_ucs4_utf8,
__gconv_transform_init_rstate,
__gconv_transform_end_rstate)
-BUILTIN_TRANSFORMATION ("([^/]+)/UTF8/([^/]*)", NULL, 0,
+BUILTIN_TRANSFORMATION ("([^/]+)/UTF-?8/([^/]*)", NULL, 0,
"\\1/UCS4/\\2", 1, "=utf8->ucs4",
__gconv_transform_utf8_ucs4,
__gconv_transform_init_rstate,