[src/trunk]: src/lib/libcurses Put slk_color() undef #ifdef HAVE_WCHAR too.

[uwe <uwe%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a3ad95b11431
branches:  trunk
changeset: 458021:a3ad95b11431
user:      uwe <uwe%NetBSD.org@localhost>
date:      Sat Jul 27 00:58:34 2019 +0000

description:
Put slk_color() undef #ifdef HAVE_WCHAR too.

diffstat:

 lib/libcurses/slk.c |  17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diffs (72 lines):

diff -r 948284ba8f51 -r a3ad95b11431 lib/libcurses/slk.c
--- a/lib/libcurses/slk.c       Sat Jul 27 00:46:43 2019 +0000
+++ b/lib/libcurses/slk.c       Sat Jul 27 00:58:34 2019 +0000
@@ -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 @@
 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 @@
        return __slk_clear(_cursesi_screen);
 }
 
+#ifdef HAVE_WCHAR
 /*
  * slk_color --
  *     Set color pair on ripped off slk window.
@@ -200,6 +201,7 @@
 
        return __slk_color(_cursesi_screen, pair);
 }
+#endif /* HAVE_WCHAR */
 
 /*
  * slk_label --
@@ -391,6 +393,7 @@
        return wrefresh(screen->slk_window);
 }
 
+#ifdef HAVE_WCHAR
 /*
  * __slk_color --
  *     Set color pair on ripped off slk window.
@@ -403,7 +406,7 @@
                return ERR;
        return wcolor_set(screen->slk_window, pair, NULL);
 }
-
+#endif /* HAVE_WCHAR */
 
 /*
  * __slk_label --