Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 14 Sep 2019 10:51:18 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r352316 - projects/clang900-import/contrib/libedit
Message-ID:  <201909141051.x8EApIkj040226@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Sat Sep 14 10:51:18 2019
New Revision: 352316
URL: https://svnweb.freebsd.org/changeset/base/352316

Log:
  Apply tentative fix for libedit build error on arm.

Modified:
  projects/clang900-import/contrib/libedit/chartype.h
  projects/clang900-import/contrib/libedit/terminal.c

Modified: projects/clang900-import/contrib/libedit/chartype.h
==============================================================================
--- projects/clang900-import/contrib/libedit/chartype.h	Sat Sep 14 08:15:16 2019	(r352315)
+++ projects/clang900-import/contrib/libedit/chartype.h	Sat Sep 14 10:51:18 2019	(r352316)
@@ -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. */

Modified: projects/clang900-import/contrib/libedit/terminal.c
==============================================================================
--- projects/clang900-import/contrib/libedit/terminal.c	Sat Sep 14 08:15:16 2019	(r352315)
+++ projects/clang900-import/contrib/libedit/terminal.c	Sat Sep 14 10:51:18 2019	(r352316)
@@ -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);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909141051.x8EApIkj040226>