diff options
| author | Roland McGrath <roland@gnu.org> | 1995-03-09 10:00:12 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-03-09 10:00:12 +0000 |
| commit | 6c2f050742cfb5b3ff6ee96b106409f541eb53bc (patch) | |
| tree | f7296a81b8d5524dddfa0aa1cc24342d8ef9ac24 /locale | |
| parent | 286351153566acc7dcc82834d90e0b8d87dff8be (diff) | |
| download | glibc-6c2f050742cfb5b3ff6ee96b106409f541eb53bc.tar.gz glibc-6c2f050742cfb5b3ff6ee96b106409f541eb53bc.tar.xz glibc-6c2f050742cfb5b3ff6ee96b106409f541eb53bc.zip | |
Wed Mar 8 13:38:13 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* posix/glob/configure.bat: Fixes from DJ. * time/backward, time/europe, time/northamerica, time/pacificnew, time/zdump.c, time/zic.c, time/tzfile.h, time/private.h, time/ialloc.c: Code and data updated from ADO's 95b. * time/emkdir.c: File removed. * time/Makefile (distribute, extra-objs, zic): Omit it. * time/localtime.c: Deansideclized. Never #define __tzname et al to non-__ names. * locale/lc-ctype.c (__ctype_tolower, __ctype_toupper): Use int * instead of short int *. * ctype/ctype-info.c: Likewise. * ctype/ctype.h: Likewise. * locale/langinfo.h (_NL_CTYPE_CLASS): Use this (just one) instead of EB and EL versions.
Diffstat (limited to 'locale')
| -rw-r--r-- | locale/langinfo.h | 7 | ||||
| -rw-r--r-- | locale/lc-ctype.c | 9 |
2 files changed, 8 insertions, 8 deletions
diff --git a/locale/langinfo.h b/locale/langinfo.h index cf3b8c054b..e94be68430 100644 --- a/locale/langinfo.h +++ b/locale/langinfo.h @@ -96,18 +96,17 @@ typedef enum ERA, /* Alternate era. */ ERA_YEAR, /* Year in alternate era format. */ - ERA_D_FMT, /* Date in alternate ear format. */ + ERA_D_FMT, /* Date in alternate era format. */ ALT_DIGITS, /* Alternate symbols for digits. */ _NL_NUM_LC_TIME, /* Number of indices in LC_TIME category. */ /* LC_CTYPE category: character classification. This information is accessed by the functions in <ctype.h>. - These `nl_langinfo' names are used internally. */ - _NL_CTYPE_CLASS_EB = _NL_ITEM (LC_CTYPE, 0), + These `nl_langinfo' names are used only internally. */ + _NL_CTYPE_CLASS = _NL_ITEM (LC_CTYPE, 0), _NL_CTYPE_TOUPPER_EB, _NL_CTYPE_TOLOWER_EB, - _NL_CTYPE_CLASS_EL, _NL_CTYPE_TOUPPER_EL, _NL_CTYPE_TOLOWER_EL, _NL_NUM_LC_CTYPE, diff --git a/locale/lc-ctype.c b/locale/lc-ctype.c index 9b72ad16eb..c634d12adb 100644 --- a/locale/lc-ctype.c +++ b/locale/lc-ctype.c @@ -40,12 +40,13 @@ _nl_postload_ctype (void) #else #error bizarre byte order #endif +#define eval(x) x #define current(unsigned,x) \ - ((const unsigned short int *) _NL_CURRENT (LC_CTYPE, bo(_NL_CTYPE_##x)) \ + ((const unsigned int *) _NL_CURRENT (LC_CTYPE, _NL_CTYPE_##eval(x)) \ + 128) - __ctype_b = current (unsigned, CLASS); - __ctype_toupper = current (, TOUPPER); - __ctype_tolower = current (, TOLOWER); + __ctype_b = current (unsigned short, CLASS); + __ctype_toupper = current (, bo (TOUPPER)); + __ctype_tolower = current (, bo (TOLOWER)); } |