Module Name: src
Committed By: blymn
Date: Tue Apr 12 21:54:16 UTC 2022
Modified Files:
src/lib/libcurses: insdelln.c refresh.c
Log Message:
Fix compile breakage when wide char support is disabled.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libcurses/insdelln.c
cvs rdiff -u -r1.119 -r1.120 src/lib/libcurses/refresh.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/insdelln.c
diff -u src/lib/libcurses/insdelln.c:1.21 src/lib/libcurses/insdelln.c:1.22
--- src/lib/libcurses/insdelln.c:1.21 Tue Apr 12 07:03:04 2022
+++ src/lib/libcurses/insdelln.c Tue Apr 12 21:54:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: insdelln.c,v 1.21 2022/04/12 07:03:04 blymn Exp $ */
+/* $NetBSD: insdelln.c,v 1.22 2022/04/12 21:54:16 blymn Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: insdelln.c,v 1.21 2022/04/12 07:03:04 blymn Exp $");
+__RCSID("$NetBSD: insdelln.c,v 1.22 2022/04/12 21:54:16 blymn Exp $");
#endif /* not lint */
/*
@@ -158,7 +158,7 @@ winsdelln(WINDOW *win, int nlines)
win->alines[y]->line[i].ch = win->bch;
win->alines[y]->line[i].attr = attr;
win->alines[y]->line[i].ch = win->bch;
-#ifndef HAVE_WCHAR
+#ifdef HAVE_WCHAR
lp = &win->alines[y]->line[i];
lp->wcols = 1;
if (_cursesi_copy_nsp(win->bnsp, lp) == ERR)
Index: src/lib/libcurses/refresh.c
diff -u src/lib/libcurses/refresh.c:1.119 src/lib/libcurses/refresh.c:1.120
--- src/lib/libcurses/refresh.c:1.119 Tue Apr 12 07:03:04 2022
+++ src/lib/libcurses/refresh.c Tue Apr 12 21:54:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: refresh.c,v 1.119 2022/04/12 07:03:04 blymn Exp $ */
+/* $NetBSD: refresh.c,v 1.120 2022/04/12 21:54:16 blymn Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)refresh.c 8.7 (Berkeley) 8/13/94";
#else
-__RCSID("$NetBSD: refresh.c,v 1.119 2022/04/12 07:03:04 blymn Exp $");
+__RCSID("$NetBSD: refresh.c,v 1.120 2022/04/12 21:54:16 blymn Exp $");
#endif
#endif /* not lint */
@@ -1297,8 +1297,8 @@ makech(int wy)
#ifdef HAVE_WCHAR
if (_cursesi_copy_nsp(blank.nsp, csp) == ERR)
return ERR;
-#endif /* HAVE_WCHAR */
csp->wcols = blank.wcols;
+#endif /* HAVE_WCHAR */
assert(csp != &blank);
csp++;
}
