diff options
| author | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2009-11-30 22:37:27 +0100 |
| commit | db260b19e3edb9e153abf784711a3ae13e40db4a (patch) | |
| tree | 4a9d9e50072d36ee917a570f8bf83a0117e971db /cmd-line-utils | |
| parent | 0df8279c468235f4feaf9eb25aa2beb5032ee1dc (diff) | |
| parent | 4a458290441937661136c73afa61393a6634f7b0 (diff) | |
| download | mariadb-git-db260b19e3edb9e153abf784711a3ae13e40db4a.tar.gz | |
Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes.
Also merge charset patch.
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/readline/config_readline.h | 5 | ||||
| -rw-r--r-- | cmd-line-utils/readline/display.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/cmd-line-utils/readline/config_readline.h b/cmd-line-utils/readline/config_readline.h index 69bf18efc1f..141989ec3c9 100644 --- a/cmd-line-utils/readline/config_readline.h +++ b/cmd-line-utils/readline/config_readline.h @@ -7,11 +7,6 @@ # include <config.h> #endif -/* to get wcwidth() defined */ -#define _XOPEN_SOURCE 600 -#define _XOPEN_SOURCE_EXTENDED -#define _XOPEN_ - /* Ultrix botches type-ahead when switching from canonical to non-canonical mode, at least through version 4.3 diff --git a/cmd-line-utils/readline/display.c b/cmd-line-utils/readline/display.c index fa710fc28b1..eb628896d69 100644 --- a/cmd-line-utils/readline/display.c +++ b/cmd-line-utils/readline/display.c @@ -824,7 +824,7 @@ rl_redisplay () cpos_buffer_position = out; lb_linenum = newlines; } - for (i = in; (size_t) i < in+wc_bytes; i++) + for (i = in; i < in+(int)wc_bytes; i++) line[out++] = rl_line_buffer[i]; for (i = 0; i < wc_width; i++) CHECK_LPOS(); |