* iconv/gconv_conf.c (builtin_aliases): Mark as const.

	* iconv/gconv_open.c (internal_trans_names): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 43795692d6b407e1ef6b42d6344b751c3b0b46f5..ffe93fa06f0e48b846f0fe3d0ccdfb0431c7392c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2005-12-20  Ulrich Drepper  <drepper@redhat.com>
 
-       * iconv/gconv_open.c (internal_trans_names): Mark as const.
+       * iconv/gconv_conf.c (builtin_aliases): Mark as const.
+       * iconv/gconv_open.c (internal_trans_names): Likewise.
 
 2005-12-19  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 

diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index 858d40998b2597448bf10e8f142e88ba28180fdb..37179518ba9a5f7e00ce3aa7823ab5680dec9145 100644 (file)
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -1,5 +1,5 @@
 /* Handle configuration data.
-   Copyright (C) 1997,98,99,2000,2001,2002,2003 Free Software Foundation, Inc.
+   Copyright (C) 1997-2003, 2005 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
 
@@ -78,7 +78,7 @@ static struct gconv_module builtin_modules[] =
 #undef BUILTIN_ALIAS
 };
 
-static const char *builtin_aliases[] =
+static const char *const builtin_aliases[] =
 {
 #define BUILTIN_TRANSFORMATION(From, To, Cost, Name, Fct, BtowcFct, \
                               MinF, MaxF, MinT, MaxT)

diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 77ce9229637d7beef20b7c6343aaa172974c9a55..a63c0472335b5b15e5fb4a8ecf6dc7974bc48a66 100644 (file)
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-19  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
+
+       * sysdeps/sh/tcb-offsets.sym: Add POINTER_GUARD.
+       * sysdeps/sh/tls.h (tcbhead_t): Remove private and add pointer_guard.
+       (THREAD_GET_POINTER_GUARD, THREAD_SET_POINTER_GUARD,
+       THREAD_COPY_POINTER_GUARD): Define.
+
 2005-12-19  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/ia64/tls.h (TLS_PRE_TCB_SIZE): Make room for 2 uintptr_t's