* iconv/gconv_open.c (internal_trans_names): Mark as const.

diff --git a/ChangeLog b/ChangeLog
index b86507a8d12b82d78916836b8b3d38d787bbc5cd..43795692d6b407e1ef6b42d6344b751c3b0b46f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-20  Ulrich Drepper  <drepper@redhat.com>
+
+       * iconv/gconv_open.c (internal_trans_names): Mark as const.
+
 2005-12-19  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
        * sysdeps/unix/sysv/linux/sh/sysdep.h: Include tls.h.

diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c
index b23ab44e4e272b4385b99f78ef993183ff8d90bb..95f320339455e490e84f3729dc9e44d56b2ea14a 100644 (file)
--- a/iconv/gconv_open.c
+++ b/iconv/gconv_open.c
@@ -71,7 +71,8 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
                {
                  /* It's the builtin transliteration handling.  We only
                     support it for working on the internal encoding.  */
-                 static const char *internal_trans_names[1] = { "INTERNAL" };
+                 static const char *const internal_trans_names[1]
+                   = { "INTERNAL" };
                  struct trans_struct *lastp = NULL;
                  struct trans_struct *runp;
 
@@ -90,7 +91,7 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle,
 
                      /* We leave the `name' field zero to signal that
                         this is an internal transliteration step.  */
-                     newp->csnames = internal_trans_names;
+                     newp->csnames = (const char **) internal_trans_names;
                      newp->ncsnames = 1;
                      newp->trans_fct = __gconv_transliterate;