diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-05-21 15:40:14 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-05-21 15:40:14 +0000 |
| commit | 23f0c99c0eb54cd481167d5927dafc1650bcbca1 (patch) | |
| tree | cd1db4054738b46da815bf3a258b143b20063170 /locale | |
| parent | 32c85e43ed25cc954cb9ba62a6aad7c9338a2a08 (diff) | |
| download | glibc-23f0c99c0eb54cd481167d5927dafc1650bcbca1.tar.gz glibc-23f0c99c0eb54cd481167d5927dafc1650bcbca1.tar.xz glibc-23f0c99c0eb54cd481167d5927dafc1650bcbca1.zip | |
Update.
1998-05-21 15:27 Ulrich Drepper <drepper@cygnus.com> * wcsmbs/wcsnrtombs.c: Correct computation of result. * wcsmbs/wcsrtombs.c: Likewise. * wcsmbs/Makefile (tests): Add wcsmbs-tst1.c. * wcsmbs/wcsmbs-tst1.c: New file. * iconv/loop.c (COUNT_CONVERTED): Correct computation. * locale/C-ctype.c (_nl_C_LC_CTYPE): Define MB_CUR_MAX for C locale as 1. * locale/setlocale.c: Don't make _nl_current_* and _nl_C_* references weak. 1998-05-21 Philip Blundell <philb@gnu.org> * sysdeps/arm/fpu_control.h: Replace stub file with real implementation. * sysdeps/arm/fpu/bits/fenv.h: New file. * sysdeps/arm/fpu/fesetround.c: Likewise. * sysdeps/arm/fpu/fclrexcpt.c: Likewise. * sysdeps/arm/fpu/fsetexcptflag.c: Likewise. * sysdeps/arm/fpu/ftestexcpt.c: Likewise. * sysdeps/arm/fpu/fraiseexcpt.c: Likewise. * sysdeps/arm/fpu/fegetenv.c: Likewise. * sysdeps/arm/fpu/fesetenv.c: Likewise. 1998-05-21 16:34 Richard Henderson <rth@cygnus.com> * elf/dl-load.c (_dl_map_object_from_fd): Get file header with read instead of mmap.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/C-ctype.c | 2 | ||||
| -rw-r--r-- | locale/setlocale.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/locale/C-ctype.c b/locale/C-ctype.c index 0ea0310093..92b96f21d2 100644 --- a/locale/C-ctype.c +++ b/locale/C-ctype.c @@ -367,7 +367,7 @@ const struct locale_data _nl_C_LC_CTYPE = "print\0" "graph\0" "blank\0" "cntrl\0" "punct\0" "alnum\0" }, { string: "tolower\0" "toupper\0" }, { string: _nl_C_LC_CTYPE_width }, - { word: 2 }, + { word: 1 }, { string: "ANSI_X3.4-1968" } } }; diff --git a/locale/setlocale.c b/locale/setlocale.c index 4b6a300481..54ca416887 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -36,8 +36,7 @@ then nothing is using the locale data. */ #define DEFINE_CATEGORY(category, category_name, items, a, b, c, d) \ extern struct locale_data *_nl_current_##category; \ -extern struct locale_data _nl_C_##category; \ -weak_extern (_nl_current_##category) weak_extern (_nl_C_##category) +extern struct locale_data _nl_C_##category; #include "categories.def" #undef DEFINE_CATEGORY |