From owner-svn-src-projects@freebsd.org Sat Sep 14 10:51:18 2019 Return-Path: Delivered-To: svn-src-projects@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E2509F070E for ; Sat, 14 Sep 2019 10:51:18 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46Vq7B5kqLz3KSf; Sat, 14 Sep 2019 10:51:18 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A96E51EA03; Sat, 14 Sep 2019 10:51:18 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x8EApIqp040228; Sat, 14 Sep 2019 10:51:18 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x8EApIkj040226; Sat, 14 Sep 2019 10:51:18 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201909141051.x8EApIkj040226@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Sat, 14 Sep 2019 10:51:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r352316 - projects/clang900-import/contrib/libedit X-SVN-Group: projects X-SVN-Commit-Author: dim X-SVN-Commit-Paths: projects/clang900-import/contrib/libedit X-SVN-Commit-Revision: 352316 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 14 Sep 2019 10:51:18 -0000 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);