Merge pull request #221 from eworm-de/define-array-size

use a define for graphical meter array size

1 files changed, 11 insertions, 3 deletions

diff --git a/CRT.c b/CRT.c
index 517f0c82..8e3311ed 100644
--- a/CRT.c
+++ b/CRT.c
@@ -137,6 +137,8 @@ const char *CRT_treeStrAscii[TREE_STR_COUNT] = {
    "-", // TREE_STR_SHUT
 };
 
+#ifdef HAVE_LIBNCURSESW
+
 const char *CRT_treeStrUtf8[TREE_STR_COUNT] = {
    "\xe2\x94\x80", // TREE_STR_HORZ ─
    "\xe2\x94\x82", // TREE_STR_VERT │
@@ -147,14 +149,16 @@ const char *CRT_treeStrUtf8[TREE_STR_COUNT] = {
    "\xe2\x94\x80", // TREE_STR_SHUT ─
 };
 
+bool CRT_utf8 = false;
+
+#endif
+
 const char **CRT_treeStr = CRT_treeStrAscii;
 
 static bool CRT_hasColors;
 
 int CRT_delay = 0;
 
-bool CRT_utf8 = false;
-
 int* CRT_colors;
 
 int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
@@ -603,7 +607,11 @@ void CRT_init(int delay, int colorScheme) {
       CRT_utf8 = false;
 #endif
 
-   CRT_treeStr = CRT_utf8 ? CRT_treeStrUtf8 : CRT_treeStrAscii;
+   CRT_treeStr =
+#ifdef HAVE_LIBNCURSESW
+	   CRT_utf8 ? CRT_treeStrUtf8 :
+#endif
+	   CRT_treeStrAscii;
 
 #if NCURSES_MOUSE_VERSION > 1
    mousemask(BUTTON1_RELEASED | BUTTON4_PRESSED | BUTTON5_PRESSED, NULL);