[src/trunk]: src/lib/libedit Fix type and remove cast (Yuichiro NAITO/FreeBSD).

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/70d99125a5b7
branches:  trunk
changeset: 459567:70d99125a5b7
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Sep 15 21:09:11 2019 +0000

description:
Fix type and remove cast (Yuichiro NAITO/FreeBSD).

diffstat:

 lib/libedit/chartype.h |  4 ++--
 lib/libedit/terminal.c |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 5193a02f87a9 -r 70d99125a5b7 lib/libedit/chartype.h
--- a/lib/libedit/chartype.h    Sun Sep 15 21:04:41 2019 +0000
+++ b/lib/libedit/chartype.h    Sun Sep 15 21:09:11 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: chartype.h,v 1.35 2017/05/22 19:16:25 christos Exp $   */
+/*     $NetBSD: chartype.h,v 1.36 2019/09/15 21:09:11 christos Exp $   */
 
 /*-
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -87,7 +87,7 @@
 /* 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 -r 5193a02f87a9 -r 70d99125a5b7 lib/libedit/terminal.c
--- a/lib/libedit/terminal.c    Sun Sep 15 21:04:41 2019 +0000
+++ b/lib/libedit/terminal.c    Sun Sep 15 21:09:11 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: terminal.c,v 1.39 2019/07/23 10:18:52 christos Exp $   */
+/*     $NetBSD: terminal.c,v 1.40 2019/09/15 21:09:11 christos Exp $   */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)term.c     8.2 (Berkeley) 4/30/95";
 #else
-__RCSID("$NetBSD: terminal.c,v 1.39 2019/07/23 10:18:52 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.40 2019/09/15 21:09:11 christos Exp $");
 #endif
 #endif /* not lint && not SCCSID */
 
@@ -1224,7 +1224,7 @@
 {
        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);