Module Name: src
Committed By: rin
Date: Mon Nov 13 01:51:47 UTC 2017
Modified Files:
src/external/bsd/nvi/dist/cl: cl_funcs.c
src/external/bsd/nvi/usr.bin/nvi: Makefile
Log Message:
Use mvwchgat(3), which is not a macro in general (and in our case).
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/nvi/dist/cl/cl_funcs.c
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/nvi/usr.bin/nvi/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/nvi/dist/cl/cl_funcs.c
diff -u src/external/bsd/nvi/dist/cl/cl_funcs.c:1.6 src/external/bsd/nvi/dist/cl/cl_funcs.c:1.7
--- src/external/bsd/nvi/dist/cl/cl_funcs.c:1.6 Mon Nov 13 01:37:48 2017
+++ src/external/bsd/nvi/dist/cl/cl_funcs.c Mon Nov 13 01:51:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cl_funcs.c,v 1.6 2017/11/13 01:37:48 rin Exp $ */
+/* $NetBSD: cl_funcs.c,v 1.7 2017/11/13 01:51:47 rin Exp $ */
/*-
* Copyright (c) 1993, 1994
* The Regents of the University of California. All rights reserved.
@@ -16,7 +16,7 @@
static const char sccsid[] = "Id: cl_funcs.c,v 10.72 2002/03/02 23:18:33 skimo Exp (Berkeley) Date: 2002/03/02 23:18:33 ";
#endif /* not lint */
#else
-__RCSID("$NetBSD: cl_funcs.c,v 1.6 2017/11/13 01:37:48 rin Exp $");
+__RCSID("$NetBSD: cl_funcs.c,v 1.7 2017/11/13 01:51:47 rin Exp $");
#endif
#include <sys/types.h>
@@ -314,9 +314,12 @@ cl_cursor(SCR *sp, size_t *yp, size_t *x
int
cl_deleteln(SCR *sp)
{
- CHAR_T ch;
WINDOW *win;
- size_t col, lno, spcnt, y, x;
+ size_t y, x;
+#ifndef HAVE_MVWCHGAT
+ CHAR_T ch;
+ size_t col, lno, spcnt;
+#endif
win = CLSP(sp) ? CLSP(sp) : stdscr;
@@ -340,7 +343,7 @@ cl_deleteln(SCR *sp)
*/
if (!F_ISSET(sp, SC_SCR_EXWROTE) && IS_SPLIT(sp)) {
getyx(win, y, x);
-#ifdef mvchgat
+#ifdef HAVE_MVWCHGAT
mvwchgat(win, RLNO(sp, LASTLINE(sp)), 0, -1, A_NORMAL, 0, NULL);
#else
for (lno = RLNO(sp, LASTLINE(sp)), col = spcnt = 0;;) {
Index: src/external/bsd/nvi/usr.bin/nvi/Makefile
diff -u src/external/bsd/nvi/usr.bin/nvi/Makefile:1.9 src/external/bsd/nvi/usr.bin/nvi/Makefile:1.10
--- src/external/bsd/nvi/usr.bin/nvi/Makefile:1.9 Mon Nov 6 03:37:52 2017
+++ src/external/bsd/nvi/usr.bin/nvi/Makefile Mon Nov 13 01:51:47 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2017/11/06 03:37:52 rin Exp $
+# $NetBSD: Makefile,v 1.10 2017/11/13 01:51:47 rin Exp $
.include <bsd.own.mk>
@@ -9,6 +9,7 @@ CWARNFLAGS.clang+= -Wno-uninitialized -W
CPPFLAGS+=-I${DIST}/include -I${.CURDIR} -I. -DGTAGS
CPPFLAGS+=-DHAVE_OPENPTY -DHAVE_UTIL_H
CPPFLAGS+=-DHAVE_SIGTIMEDWAIT
+CPPFLAGS+=-DHAVE_MVWCHGAT
#DBG=-g
#CPPFLAGS+=-DLOGDEBUG -DTRACE
