* locale/categories.def (LC_TIME): No more _nl_postload_time.

	* locale/setlocale.c (_nl_category_postload): Use weak refs only under
	[_NL_CURRENT_INDIRECT].

diff --git a/ChangeLog b/ChangeLog
index 8280ada03a09a9669df0f1c77bbfdc21122c5195..f531f07abad8246eb6e5a44d66cc3348253cd24a 100644 (file)
--- 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 a48f171c929d701c5c80031543ac8def2d72868e..56a875e378981d73767ed223dd62a63e53f8800a 100644 (file)
--- 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