diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-09-14 10:51:18 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-09-14 10:51:18 +0000 |
| commit | c0035c9efc3e65e31fe49c04eb44334f3cffcfa9 (patch) | |
| tree | 8c4188f50cbf9fd336f7ca10bb2d21363156a114 /contrib | |
| parent | 61c1328eb016476ee7ff5ad65d8224bb43e572db (diff) | |
| download | src-c0035c9efc3e65e31fe49c04eb44334f3cffcfa9.tar.gz src-c0035c9efc3e65e31fe49c04eb44334f3cffcfa9.zip | |
Apply tentative fix for libedit build error on arm.
Notes
Notes:
svn path=/projects/clang900-import/; revision=352316
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libedit/chartype.h | 2 | ||||
| -rw-r--r-- | contrib/libedit/terminal.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/libedit/chartype.h b/contrib/libedit/chartype.h index 4cdd981df14f..3eda7da07296 100644 --- a/contrib/libedit/chartype.h +++ b/contrib/libedit/chartype.h @@ -87,7 +87,7 @@ libedit_private size_t ct_enc_width(wchar_t); /* The terminal is thought of in terms of X columns by Y lines. In the cases * where a wide character takes up more than one column, the adjacent * occupied column entries will contain this faux character. */ -#define MB_FILL_CHAR ((wchar_t)-1) +#define MB_FILL_CHAR ((wint_t)-1) /* Visual width of character c, taking into account ^? , \0177 and \U+nnnnn * style visual expansions. */ diff --git a/contrib/libedit/terminal.c b/contrib/libedit/terminal.c index c0b9bda67c55..34f4985a90bc 100644 --- a/contrib/libedit/terminal.c +++ b/contrib/libedit/terminal.c @@ -1224,7 +1224,7 @@ terminal__putc(EditLine *el, wint_t c) { char buf[MB_LEN_MAX +1]; ssize_t i; - if (c == (wint_t)MB_FILL_CHAR) + if (c == MB_FILL_CHAR) return 0; if (c & EL_LITERAL) return fputs(literal_get(el, c), el->el_outfile); |