diff options
author | Roland McGrath <roland@gnu.org> | 1996-07-04 00:07:18 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 1996-07-04 00:07:18 +0000 |
commit | 503054c0dd57109017b36870c430dab00fccaa8b (patch) | |
tree | e3788a147156c19d4cf38cc8da0bfcf8d3c6c109 /locale | |
parent | 175b633d811d6427fb9206c2bed6aa49f8500b36 (diff) |
Wed Jul 3 16:29:41 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>cvs/libc-960705cvs/libc-960704
* nss/getXXbyYY_r.c (REENTRANT_NAME): Cast FCT in __nss_next call.
* sysdeps/generic/sbrk.c: Always call __brk (0) to update __curbrk.
* malloc/malloc-size.c (malloc_usable_size): Renamed from
malloc_object_allocation_size.
* malloc/malloc.h: Fix decl.
* sys/select.h: New file, wrapper header.
* posix/sys/types.h [__USE_BSD]: Include <sys/select.h>; remove
fd_set, associated macros, and select decl.
* sysdeps/posix/isfdtype.c: New file.
Tue Jul 2 23:45:14 1996 Ulrich Drepper <drepper@cygnus.com>
The latest Japanese proposal for POSIX locales renames the
CHARMAP keyword in locale definition files to CHARCONV.
* locale/programs/ld-ctype.c, locale/programs/locales.h: Rename
function ctype_is_charmap to ctype_is_charconv.
* locale/programs/locfile-kw.gperf: Replace charmap keyword with
charconv.
* locale/programs/locfile-token.h: Add definition of token
charconv.
* locale/programs/locfile.c: Recognize charconv keyword. Rename
lables according to this.
* locale/weight.h (get_weight): Cast constants to prevent
warnings.
* stdlib/strtod.c, stdlib/strtol.c, string/strcoll.c,
string/strxfrm.c: Add some more casts to prevent signed<->unsigned
warnings.
New stuff described in P1003.1g.
* misc/Makefile (headers): Add sys/select.h.
(routines): Add pselect.
* misc/sys/select.h: New file. Declare select functions and
needed data types and macros.
* sysdeps/generic/pselect.c: New file. Add generic implementation
of pselect() function which uses select().
* posix/getconf.c: Recognize new variables from P1003.1g.
* posix/posix1_lim.h: Define _POSIX_FD_SETSIZE, _POSIX_QLIMIT,
_POSIX_HIWAT, and _POSIX_UIO_MAXIOV.
* posix/unistd.h: Add description of the P1003.1g variables.
* sysdeps/generic/confname.h: Define _SC_* values for new
variables.
* sysdeps/posix/fpathconf.c (fpathconf): Add handling of
_PC_SOCK_MAXBUF.
* sysdeps/stub/fpathconf.c (fpathconf): Ditto.
* sysdeps/posix/sysconf.c (sysconf): Add handling of new
P1003.1g variables.
* sysdeps/stub/sysconf.c (sysconf): Ditto.
* sysdeps/unix/sysv/linux/posix_opt.h: Define _POSIX_POLL and
_POSIX_SELECT since Linux has this.
* socket/Makefile (routines): Add isfdtype.
* sysdeps/generic/sys/socket.h: Add prototype for isfdtype.
* sysdeps/stub/isfdtype.c: New file. Stub implementation of
isfdtype.
* wcsmbs/wcrtomb.c (wcrtomb): Fix typo.
Diffstat (limited to 'locale')
-rw-r--r-- | locale/programs/ld-ctype.c | 4 | ||||
-rw-r--r-- | locale/programs/locales.h | 4 | ||||
-rw-r--r-- | locale/programs/locfile-kw.gperf | 2 | ||||
-rw-r--r-- | locale/programs/locfile-token.h | 4 | ||||
-rw-r--r-- | locale/programs/locfile.c | 22 | ||||
-rw-r--r-- | locale/weight.h | 2 |
6 files changed, 20 insertions, 18 deletions
diff --git a/locale/programs/ld-ctype.c b/locale/programs/ld-ctype.c index 4c74549983..0ca3af584b 100644 --- a/locale/programs/ld-ctype.c +++ b/locale/programs/ld-ctype.c @@ -665,8 +665,8 @@ ctype_map_new (struct linereader *lr, struct localedef_t *locale, int -ctype_is_charmap (struct linereader *lr, struct localedef_t *locale, - const char *name) +ctype_is_charconv (struct linereader *lr, struct localedef_t *locale, + const char *name) { struct locale_ctype_t *ctype = locale->categories[LC_CTYPE].ctype; size_t cnt; diff --git a/locale/programs/locales.h b/locale/programs/locales.h index a992642805..9fe85e9e07 100644 --- a/locale/programs/locales.h +++ b/locale/programs/locales.h @@ -99,8 +99,8 @@ void ctype_class_to (struct linereader *lr, struct localedef_t *locale, struct token *code, struct charset_t *charset); void ctype_class_end (struct linereader *lr, struct localedef_t *locale); -int ctype_is_charmap (struct linereader *lr, struct localedef_t *locale, - const char *name); +int ctype_is_charconv (struct linereader *lr, struct localedef_t *locale, + const char *name); void ctype_map_new (struct linereader *lr, struct localedef_t *locale, enum token_t tok, struct token *code, struct charset_t *charset); diff --git a/locale/programs/locfile-kw.gperf b/locale/programs/locfile-kw.gperf index 85e031c777..8af977116e 100644 --- a/locale/programs/locfile-kw.gperf +++ b/locale/programs/locfile-kw.gperf @@ -42,7 +42,7 @@ print, tok_print, 0 xdigit, tok_xdigit, 0 blank, tok_blank, 0 charclass, tok_charclass, 0 -charmap, tok_charmap, 0 +charconv, tok_charconv, 0 toupper, tok_toupper, 0 tolower, tok_tolower, 0 LC_COLLATE, tok_lc_collate, 0 diff --git a/locale/programs/locfile-token.h b/locale/programs/locfile-token.h index 1c3cfdc9db..b07356aebd 100644 --- a/locale/programs/locfile-token.h +++ b/locale/programs/locfile-token.h @@ -1,3 +1,4 @@ + /* Copyright (C) 1996 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper, <drepper@gnu.ai.mit.edu>. @@ -42,6 +43,7 @@ enum token_t tok_escape_char, tok_comment_char, + tok_charmap, tok_end, tok_g0esc, tok_g1esc, @@ -51,7 +53,7 @@ enum token_t tok_code_set_name, tok_mb_cur_max, tok_mb_cur_min, - tok_charmap, + tok_charconv, tok_width, tok_width_variable, tok_width_default, diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c index 284c7ce5b6..e225e577d6 100644 --- a/locale/programs/locfile.c +++ b/locale/programs/locfile.c @@ -280,11 +280,11 @@ syntax error in definition of new character class")); continue; } - if (nowtok == tok_charmap) + if (nowtok == tok_charconv) { - READ_STRING_LIST (ctype_map_new, bad_new_charmap); + READ_STRING_LIST (ctype_map_new, bad_new_charconv); continue; - bad_new_charmap: + bad_new_charconv: SYNTAX_ERROR (_("\ syntax error in definition of new character map")); continue; @@ -324,7 +324,7 @@ syntax error in definition of new character map")); } /* ...or a self-defined character map. */ - if (ctype_is_charmap (ldfile, result, now->val.str.start)) + if (ctype_is_charconv (ldfile, result, now->val.str.start)) { ctype_tok_sym = nowtok; ctype_tok_str = now->val.str.start; @@ -411,14 +411,14 @@ syntax error in character class definition")); { /* Match ( bsymbol , bsymbol ) */ if (now->tok != tok_open_brace) - goto bad_charmap; + goto bad_charconv; now = lr_token (ldfile, charset); if (now->tok != tok_bsymbol) { - bad_charmap: + bad_charconv: SYNTAX_ERROR (_("\ -syntax error in character mapping definition")); +syntax error in character conversion definition")); state = 3; break; } @@ -428,18 +428,18 @@ syntax error in character mapping definition")); now = lr_token (ldfile, charset); if (now->tok != tok_comma) - goto bad_charmap; + goto bad_charconv; now = lr_token (ldfile, charset); if (now->tok != tok_bsymbol) - goto bad_charmap; + goto bad_charconv; /* Lookup arg and assign to TO. */ ctype_map_to (ldfile, result, now, charset); now = lr_token (ldfile, charset); if (now->tok != tok_close_brace) - goto bad_charmap; + goto bad_charconv; now = lr_token (ldfile, charset); if (now->tok == tok_eol) @@ -448,7 +448,7 @@ syntax error in character mapping definition")); break; } if (now->tok != tok_semicolon) - goto bad_charmap; + goto bad_charconv; now = lr_token (ldfile, charset); } diff --git a/locale/weight.h b/locale/weight.h index 904a154f82..c7a9f96c24 100644 --- a/locale/weight.h +++ b/locale/weight.h @@ -92,7 +92,7 @@ get_weight (const STRING_TYPE **str, weight_t *result) } } - if (__collate_table[slot + 1] != FORWARD_CHAR) + if (__collate_table[slot + 1] != (u_int32_t) FORWARD_CHAR) { /* We have a simple form. One one value for each weight. */ size_t cnt; |