* locale/nl_langinfo.c [NL_CURRENT_INDIRECT]: Use a categories.def

	iterator to refer to each category's _nl_current_LC_FOO symbol, so
	we know they are all linked in.

diff --git a/ChangeLog b/ChangeLog
index cd6fb77b81c53683a6750d86d6e69f65a602b7b3..d8455f871e5280675f8c04c4899f954124758392 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-08-28  Roland McGrath  <roland@redhat.com>
 
+       * locale/nl_langinfo.c [NL_CURRENT_INDIRECT]: Use a categories.def
+       iterator to refer to each category's _nl_current_LC_FOO symbol, so
+       we know they are all linked in.
+
        * NEWS: Added 2.2.6 text from 2.2 branch version.
 
        * time/strptime.c (strptime_internal): Remove spurious const.

diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog
index 1091ce6cdf4dec53136d18dcf56f7afdb1c257cc..2ae14e01d8704348d756c26468766e25b5751e2f 100644 (file)
--- a/linuxthreads/ChangeLog
+++ b/linuxthreads/ChangeLog
@@ -1,3 +1,7 @@
+2002-08-28  Roland McGrath  <roland@redhat.com>
+
+       * sysdeps/pthread/timer_routines.c (thread_func): Fix type in cast.
+
 2002-08-28  Jakub Jelinek  <jakub@redhat.com>
 
        * sysdeps/unix/sysv/linux/hppa/aio_cancel.c: New file.
@@ -7,7 +11,7 @@
 2002-08-28  Ulrich Drepper  <drepper@redhat.com>
 
        * sysdeps/pthread/timer_routines.c (thread_func): Change return
-       type to void and add casts in use to avoid warnings wit all gcc
+       type to void and add casts in use to avoid warnings with all gcc
        versions.
 
 2002-08-08  Jakub Jelinek  <jakub@redhat.com>

diff --git a/locale/nl_langinfo.c b/locale/nl_langinfo.c
index 7df2b30ba9f78ef6a301bb923b80f9d731f7f17a..2314b80f0f4df0cd9cf44450a839cfb33df8f901 100644 (file)
--- a/locale/nl_langinfo.c
+++ b/locale/nl_langinfo.c
@@ -47,6 +47,18 @@ nl_langinfo (item)
 
 #ifdef USE_IN_EXTENDED_LOCALE_MODEL
   data = l->__locales[category];
+#elif defined NL_CURRENT_INDIRECT
+  /* Make direct reference to every _nl_current_CATEGORY symbol,
+     since we know only at runtime which categories are used.  */
+  switch (category)
+    {
+# define DEFINE_CATEGORY(category, category_name, items, a) \
+      case category: data = *_nl_current_##category; break;
+# include "categories.def"
+# undef        DEFINE_CATEGORY
+    default:                   /* Should be impossible.  */
+      return (char *) "";
+    }
 #else
   data = _NL_CURRENT_DATA (category);
 #endif