Module Name: src
Committed By: uwe
Date: Sat Jul 27 00:58:34 UTC 2019
Modified Files:
src/lib/libcurses: slk.c
Log Message:
Put slk_color() undef #ifdef HAVE_WCHAR too.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libcurses/slk.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/slk.c
diff -u src/lib/libcurses/slk.c:1.5 src/lib/libcurses/slk.c:1.6
--- src/lib/libcurses/slk.c:1.5 Sat Jul 27 00:46:43 2019
+++ src/lib/libcurses/slk.c Sat Jul 27 00:58:34 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: slk.c,v 1.5 2019/07/27 00:46:43 uwe Exp $ */
+/* $NetBSD: slk.c,v 1.6 2019/07/27 00:58:34 uwe Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: slk.c,v 1.5 2019/07/27 00:46:43 uwe Exp $");
+__RCSID("$NetBSD: slk.c,v 1.6 2019/07/27 00:58:34 uwe Exp $");
#endif /* not lint */
#include <ctype.h>
@@ -60,16 +60,16 @@ __RCSID("$NetBSD: slk.c,v 1.5 2019/07/27
static int slk_fmt = SLK_FMT_INVAL; /* fmt of slk_init */
/* Safe variants of public functions. */
+static int __slk_attroff(SCREEN *, const chtype);
+static int __slk_attron(SCREEN *, const chtype);
+static int __slk_attrset(SCREEN *, const chtype);
#ifdef HAVE_WCHAR
static int __slk_attr_off(SCREEN *, const attr_t, void *);
static int __slk_attr_on(SCREEN *, const attr_t, void *);
static int __slk_attr_set(SCREEN *, const attr_t, short, void *opt);
+static int __slk_color(SCREEN *, short);
#endif
-static int __slk_attroff(SCREEN *, const chtype);
-static int __slk_attron(SCREEN *, const chtype);
-static int __slk_attrset(SCREEN *, const chtype);
-static int __slk_color(SCREEN *, short);
static int __slk_clear(SCREEN *);
static char *__slk_label(SCREEN *, int);
static int __slk_restore(SCREEN *);
@@ -190,6 +190,7 @@ slk_clear(void)
return __slk_clear(_cursesi_screen);
}
+#ifdef HAVE_WCHAR
/*
* slk_color --
* Set color pair on ripped off slk window.
@@ -200,6 +201,7 @@ slk_color(short pair)
return __slk_color(_cursesi_screen, pair);
}
+#endif /* HAVE_WCHAR */
/*
* slk_label --
@@ -391,6 +393,7 @@ __slk_clear(SCREEN *screen)
return wrefresh(screen->slk_window);
}
+#ifdef HAVE_WCHAR
/*
* __slk_color --
* Set color pair on ripped off slk window.
@@ -403,7 +406,7 @@ __slk_color(SCREEN *screen, short pair)
return ERR;
return wcolor_set(screen->slk_window, pair, NULL);
}
-
+#endif /* HAVE_WCHAR */
/*
* __slk_label --
