aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-31 21:09:35 +0000
committerRoland McGrath <roland@gnu.org>2002-08-31 21:09:35 +0000
commit0ba454fccb56eb5890ad692949323af6ad64189c (patch)
treed1139cbbb56944e335c68c0f14af93fb3fc4a23e
parent245cc7735d2bc9308a13d55e4270e913b0b0138b (diff)
downloadglibc-0ba454fccb56eb5890ad692949323af6ad64189c.zip
glibc-0ba454fccb56eb5890ad692949323af6ad64189c.tar.gz
glibc-0ba454fccb56eb5890ad692949323af6ad64189c.tar.bz2
* locale/categories.def (LC_TIME): No more _nl_postload_time.
* locale/setlocale.c (_nl_category_postload): Use weak refs only under [_NL_CURRENT_INDIRECT].
-rw-r--r--ChangeLog7
-rw-r--r--locale/setlocale.c8
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8280ada..f531f07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-31 Roland McGrath <roland@redhat.com>
+
+ * locale/categories.def (LC_TIME): No more _nl_postload_time.
+
+ * locale/setlocale.c (_nl_category_postload): Use weak refs only under
+ [_NL_CURRENT_INDIRECT].
+
2002-08-31 Ulrich Drepper <drepper@redhat.com>
* time/tst-ftime_l.c (main): Also test strftime with uselocale.
diff --git a/locale/setlocale.c b/locale/setlocale.c
index a48f171..56a875e 100644
--- a/locale/setlocale.c
+++ b/locale/setlocale.c
@@ -86,11 +86,17 @@ const size_t _nl_category_name_sizes[] =
};
+#ifdef NL_CURRENT_INDIRECT
+# define WEAK_POSTLOAD(postload) weak_extern (postload)
+#else
+# define WEAK_POSTLOAD(postload) /* Need strong refs in static linking. */
+#endif
+
/* Declare the postload functions used below. */
#undef NO_POSTLOAD
#define NO_POSTLOAD _nl_postload_ctype /* Harmless thing known to exist. */
#define DEFINE_CATEGORY(category, category_name, items, postload) \
-extern void postload (void); weak_extern (postload)
+extern void postload (void); WEAK_POSTLOAD (postload)
#include "categories.def"
#undef DEFINE_CATEGORY
#undef NO_POSTLOAD