1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4a906502fd..f1fe222842 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 1998-04-01  Ulrich Drepper  <drepper@cygnus.com>
 
+	* 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.
+
 	* iconv/gconv_simple.c (__gconv_transform_ucs4_utf8): Compute
 	number of converted bytes correctly.