diff options
| author | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-06-06 15:05:44 +0200 |
|---|---|---|
| committer | Tatiana A. Nurnberg <azundris@mysql.com> | 2009-06-06 15:05:44 +0200 |
| commit | 6e422ce034e5e4a1775c8b28abb8f5deca3f1bd9 (patch) | |
| tree | 4facc4da6326a6afd10165518d8ca3baf64d185a | |
| parent | 3738f7857f56d6728db328b11d956d9eb28933a5 (diff) | |
| download | mariadb-git-6e422ce034e5e4a1775c8b28abb8f5deca3f1bd9.tar.gz | |
Addendum to Bug #45286: backport macro name form other tree
use same (slightly unwieldy) name in all trees; fix before this version goes "public".
bless ctype to avoid upmerge conflict, le sigh.
| -rw-r--r-- | cmd-line-utils/readline/bind.c | 2 | ||||
| -rw-r--r-- | cmd-line-utils/readline/chardefs.h | 4 | ||||
| -rw-r--r-- | cmd-line-utils/readline/display.c | 2 | ||||
| -rw-r--r-- | strings/ctype.c | 5 |
4 files changed, 6 insertions, 7 deletions
diff --git a/cmd-line-utils/readline/bind.c b/cmd-line-utils/readline/bind.c index fc7bebfd813..2338f73f6c9 100644 --- a/cmd-line-utils/readline/bind.c +++ b/cmd-line-utils/readline/bind.c @@ -701,7 +701,7 @@ rl_function_of_keyseq (keyseq, map, type) { unsigned char ic = keyseq[i]; - if (META_BYTE (ic) && _rl_convert_meta_chars_to_ascii) + if (META_CHAR_FOR_UCHAR (ic) && _rl_convert_meta_chars_to_ascii) { if (map[ESC].type == ISKMAP) { diff --git a/cmd-line-utils/readline/chardefs.h b/cmd-line-utils/readline/chardefs.h index 36fe7fdd7ac..0787d9943bb 100644 --- a/cmd-line-utils/readline/chardefs.h +++ b/cmd-line-utils/readline/chardefs.h @@ -59,8 +59,8 @@ #define largest_char 255 /* Largest character value. */ #define CTRL_CHAR(c) ((c) < control_character_threshold && (((c) & 0x80) == 0)) -#define META_BYTE(c) ((c) > meta_character_threshold) -#define META_CHAR(c) (META_BYTE(c) && (c) <= largest_char) +#define META_CHAR_FOR_UCHAR(c) ((c) > meta_character_threshold) +#define META_CHAR(c) (META_CHAR_FOR_UCHAR(c) && (c) <= largest_char) #define CTRL(c) ((c) & control_character_mask) #define META(c) ((c) | meta_character_bit) diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c index 842a586b76b..a68ddff8c88 100644 --- a/cmd-line-utils/readline/display.c +++ b/cmd-line-utils/readline/display.c @@ -1888,7 +1888,7 @@ rl_character_len (c, pos) uc = (unsigned char)c; - if (META_BYTE (uc)) + if (META_CHAR_FOR_UCHAR (uc)) return ((_rl_output_meta_chars == 0) ? 4 : 1); if (uc == '\t') diff --git a/strings/ctype.c b/strings/ctype.c index 4a54d898337..17ad1256e74 100644 --- a/strings/ctype.c +++ b/strings/ctype.c @@ -328,9 +328,8 @@ my_string_repertoire(CHARSET_INFO *cs, const char *str, ulong length) { my_wc_t wc; int chlen; - for (; (chlen= cs->cset->mb_wc(cs, &wc, - (const unsigned char *) str, - (const unsigned char *) strend)) > 0; + for (; + (chlen= cs->cset->mb_wc(cs, &wc, (uchar*) str, (uchar*) strend)) > 0; str+= chlen) { if (wc > 0x7F) |