From 933e73facc338fb81f1f72af416ea57fbf439a2f Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 6 Mar 1995 03:00:08 +0000 Subject: Sun Mar 5 19:40:13 1995 Roland McGrath * locale/localeinfo.h: Rewritten for new locale system, using locale data files and with interface. * locale/setlocale.c: Rewritten to use locale data files. * langinfo.h: New file. * locale/langinfo.h: New file. * locale/nl_langinfo.c: New file. * locale/loadlocale.c: New file. * locale/lc-ctype.c: New file. * locale/lc-messages.c: New file. * locale/lc-monetary.c: New file. * locale/lc-numeric.c: New file. * locale/lc-time.c: New file. * locale/categories.def: New file. * locale/Makefile (headers): Remove localeinfo.h. (distribute): New variable; put localeinfo.h here, and categories.def. (routines): Add loadlocale. (categories): New variable. (aux): Use that to get C-category and lc-category. * ctype/ctype.h (_IS*): Use independent bits for all but _ISalnum. * locale/C-ctype.c, locale/C-messages.c: New files. * locale/C-monetary.c, locale/C-numeric.c, locale/C-time.c: Default "C" locale data updated for new locale system. * locale/C-collate.c: File removed. * locale/C-ctype_ct.c: File removed. * locale/C-ctype_mb.c: File removed. * locale/C-response.c: File removed. * locale/localeconv.c: Use _NL_CURRENT macro to access locale data. * stdio/printf_fp.c, stdio/vfprintf.c, stdio/vfscanf.c, stdlib/strtod.c, time/asctime.c, time/strftime.c: Include ../locale/localeinfo.h and use _NL_CURRENT macro to access locale data. * time/localtime.c: Don't include . * time/tzset.c: Don't use locale items for default TZ value or "GMT" string (use "UTC"). * stdio/vfprintf.c [USE_IN_LIBIO] (PAD): Only call the function if WIDTH>0; update DONE. * malloc/malloc.c (morecore): Fix last change to calculate by blocks instead of bytes. --- ctype/ctype.h | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'ctype') diff --git a/ctype/ctype.h b/ctype/ctype.h index 0f35d2a..9c97831 100644 --- a/ctype/ctype.h +++ b/ctype/ctype.h @@ -34,20 +34,21 @@ __BEGIN_DECLS many things must be changed that use `unsigned short int's. */ enum { - _ISupper = 1 << 0, /* UPPERCASE. */ - _ISlower = 1 << 1, /* lowercase. */ - _IScntrl = 1 << 2, /* Control character. */ - _ISdigit = 1 << 3, /* Numeric. */ - _ISspace = 1 << 4, /* Whitespace. */ - _IShex = 1 << 5, /* A - F, a - f. */ - _ISpunct = 1 << 6, /* Punctuation. */ - _NOgraph = 1 << 7, /* Printing but nongraphical. */ - _ISblank = 1 << 8, /* Blank (usually SPC and TAB). */ - _ISalpha = 1 << 9, /* Alphabetic. */ - _ISalnum = _ISalpha | _ISdigit, /* Alphanumeric. */ - _ISxdigit = _ISdigit | _IShex, /* Hexadecimal numeric. */ - _ISgraph = _ISalnum | _ISpunct, /* Graphical. */ - _ISprint = _ISgraph | _NOgraph /* Printing. */ + _ISupper = 1 << 0, /* UPPERCASE. */ + _ISlower = 1 << 1, /* lowercase. */ + _ISalpha = 1 << 2, /* Alphabetic. */ + _ISdigit = 1 << 3, /* Numeric. */ + _ISxdigit = 1 << 4, /* Hexadecimal numeric. */ + _ISspace = 1 << 5, /* Whitespace. */ + _ISprint = 1 << 6, /* Printing. */ + _ISgraph = 1 << 7, /* Graphical. */ + _ISblank = 1 << 8, /* Blank (usually SPC and TAB). */ + _IScntrl = 1 << 9, /* Control character. */ + _ISpunct = 1 << 10, /* Punctuation. */ + + /* The following are defined in POSIX.2 as being combinations of the + classes above. */ + _ISalnum = _ISalpha | _ISdigit /* Alphanumeric. */ }; /* These are defined in localeinfo.c. @@ -115,7 +116,7 @@ extern int toascii __P ((int __c)); #endif /* Use SVID or use misc. */ #ifdef __USE_SVID -/* These are the same as `toupper' and and `tolower'. */ +/* These are the same as `toupper' and `tolower'. */ __exctype (_toupper); __exctype (_tolower); #endif -- cgit v1.1