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

* locale/setlocale.c (_nl_category_postload): Use weak refs only under
	[_NL_CURRENT_INDIRECT].
This commit is contained in:
Roland McGrath 2002-08-31 21:09:35 +00:00
parent 245cc7735d
commit 0ba454fccb
2 changed files with 14 additions and 1 deletions

View File

@ -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> 2002-08-31 Ulrich Drepper <drepper@redhat.com>
* time/tst-ftime_l.c (main): Also test strftime with uselocale. * time/tst-ftime_l.c (main): Also test strftime with uselocale.

View File

@ -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. */ /* Declare the postload functions used below. */
#undef NO_POSTLOAD #undef NO_POSTLOAD
#define NO_POSTLOAD _nl_postload_ctype /* Harmless thing known to exist. */ #define NO_POSTLOAD _nl_postload_ctype /* Harmless thing known to exist. */
#define DEFINE_CATEGORY(category, category_name, items, postload) \ #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" #include "categories.def"
#undef DEFINE_CATEGORY #undef DEFINE_CATEGORY
#undef NO_POSTLOAD #undef NO_POSTLOAD