Module Name: src
Committed By: uwe
Date: Thu Jul 25 20:18:51 UTC 2019
Modified Files:
src/lib/libcurses: attributes.c
Log Message:
#ifdef HAVE_WCHAR around enhanced curses stuff.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/lib/libcurses/attributes.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/attributes.c
diff -u src/lib/libcurses/attributes.c:1.30 src/lib/libcurses/attributes.c:1.31
--- src/lib/libcurses/attributes.c:1.30 Sat Nov 24 01:04:18 2018
+++ src/lib/libcurses/attributes.c Thu Jul 25 20:18:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: attributes.c,v 1.30 2018/11/24 01:04:18 uwe Exp $ */
+/* $NetBSD: attributes.c,v 1.31 2019/07/25 20:18:50 uwe Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: attributes.c,v 1.30 2018/11/24 01:04:18 uwe Exp $");
+__RCSID("$NetBSD: attributes.c,v 1.31 2019/07/25 20:18:50 uwe Exp $");
#endif /* not lint */
#include "curses.h"
@@ -43,6 +43,7 @@ static void __wcolor_set(WINDOW *, attr_
#ifndef _CURSES_USE_MACROS
+#ifdef HAVE_WCHAR
/*
* attr_get --
* Get wide attributes and color pair from stdscr
@@ -97,6 +98,7 @@ color_set(short pair, void *opts)
{
return wcolor_set(stdscr, pair, opts);
}
+#endif /* HAVE_WCHAR */
/*
* attron --
@@ -130,6 +132,8 @@ attrset(int attr)
}
#endif /* _CURSES_USE_MACROS */
+
+#ifdef HAVE_WCHAR
/*
* wattr_get --
* Get wide attributes and colour pair from window
@@ -223,6 +227,8 @@ wcolor_set(WINDOW *win, short pair, void
__wcolor_set(win, (attr_t) COLOR_PAIR(pair));
return OK;
}
+#endif /* HAVE_WCHAR */
+
/*
* getattrs --
@@ -318,6 +324,8 @@ termattrs(void)
return ch;
}
+
+#ifdef HAVE_WCHAR
/*
* term_attrs --
* Get terminal wide attributes
@@ -367,6 +375,7 @@ term_attrs(void)
return attr;
}
+#endif /* HAVE_WCHAR */
static int
