Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib/libcurses Fix compile breakage when wide char support is...



details:   https://anonhg.NetBSD.org/src/rev/35bd799df9cb
branches:  trunk
changeset: 365198:35bd799df9cb
user:      blymn <blymn%NetBSD.org@localhost>
date:      Tue Apr 12 21:54:16 2022 +0000

description:
Fix compile breakage when wide char support is disabled.

diffstat:

 lib/libcurses/insdelln.c |  6 +++---
 lib/libcurses/refresh.c  |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (55 lines):

diff -r 11ce7623e8ee -r 35bd799df9cb lib/libcurses/insdelln.c
--- a/lib/libcurses/insdelln.c  Tue Apr 12 21:05:36 2022 +0000
+++ b/lib/libcurses/insdelln.c  Tue Apr 12 21:54:16 2022 +0000
@@ -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 @@
                                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)
diff -r 11ce7623e8ee -r 35bd799df9cb lib/libcurses/refresh.c
--- a/lib/libcurses/refresh.c   Tue Apr 12 21:05:36 2022 +0000
+++ b/lib/libcurses/refresh.c   Tue Apr 12 21:54:16 2022 +0000
@@ -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 @@
 #ifdef HAVE_WCHAR
                                                if (_cursesi_copy_nsp(blank.nsp, csp) == ERR)
                                                        return ERR;
+                                               csp->wcols = blank.wcols;
 #endif /* HAVE_WCHAR */
-                                               csp->wcols = blank.wcols;
                                                assert(csp != &blank);
                                                csp++;
                                        }



Home | Main Index | Thread Index | Old Index