summary refs log tree commit diff
path: root/posix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-03-12 10:25:36 +0000
committerUlrich Drepper <drepper@redhat.com>2002-03-12 10:25:36 +0000
commit418f17011fd3116c6c199021ad0aeb40ca98e7fa (patch)
tree0ab139f5e99ec0d94942677951871459c645627c /posix
parentbdff0a44ff09654d09c05e36f8c57545284ab4a4 (diff)
downloadglibc-418f17011fd3116c6c199021ad0aeb40ca98e7fa.tar.gz
glibc-418f17011fd3116c6c199021ad0aeb40ca98e7fa.tar.xz
glibc-418f17011fd3116c6c199021ad0aeb40ca98e7fa.zip
Update.
2002-03-12  Ulrich Drepper  <drepper@redhat.com>

	* posix/bug-regex5.c (main): Use nl_langinfo instead of _NL_CURRENT.

	* locale/localeinfo.h: Add attribute_hidden to _nl_current_LC_XXX,
	_nl_category_names, _nl_category_name_sizes, _nl_current,
	_nl_C_name, _nl_POSIX_name, _nl_C_codeset, and _nl_C_LC_XXX.

	* intl/dcigettext.c (_nl_default_default_domain): Define as hidden.
	(_nl_current_default_domain): Likewise
	(_nl_state_lock): Likewise.
	* intl/textdomain.c (_nl_default_default_domain): Declare as hidden.
	(_nl_current_default_domain): Likewise
	(_nl_state_lock): Likewise.
	* intl/bindtextdom.c (_nl_state_lock): Likewise.

	* stdlib/fpioconst.h (__tens): Add attribute_hidden.
	(_fpioconst_pow10): Likewise.

	* include/time.h (_tmbuf): Add attribute_hidden.

	* time/tzset.c (tzstring_list): Define as static.

	* include/time.h: Add attribute_hidden to __tzname_cur_max and
	__use_tzfile declaration.

	* wcsmbs/wcsmbsload.h: Add attribute_hidden to __wcsmbs_gconv_fcts
	and __wcsmbs_last_locale declaration.
Diffstat (limited to 'posix')
-rw-r--r--posix/bug-regex5.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/posix/bug-regex5.c b/posix/bug-regex5.c
index 12bbcffe21..58f487aa84 100644
--- a/posix/bug-regex5.c
+++ b/posix/bug-regex5.c
@@ -20,18 +20,16 @@ main (void)
     }
   printf ("current locale : %s\n", ca);
 
-  nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
+  nrules = (size_t) nl_langinfo (_NL_COLLATE_NRULES);
   if (nrules == 0)
     {
       printf("No rule\n");
       return 1;
     }
 
-  table_size = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_SYMB_HASH_SIZEMB);
-  symb_table = (const int32_t *)
-    _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_TABLEMB);
-  extra = (const unsigned char *)
-    _NL_CURRENT (LC_COLLATE, _NL_COLLATE_SYMB_EXTRAMB);
+  table_size = (size_t) nl_langinfo (_NL_COLLATE_SYMB_HASH_SIZEMB);
+  symb_table = (const int32_t *) nl_langinfo (_NL_COLLATE_SYMB_TABLEMB);
+  extra = (const unsigned char *) nl_langinfo (_NL_COLLATE_SYMB_EXTRAMB);
 
   found = 0;
   for (i = 0; i < table_size; ++i)