# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1575567903 -3600
# Node ID e966de1d037681e30edff0cda7ecb058ab5ee824
# Parent  84ee7a3e71a285a381e9a0403488707053a83289
patch 8.1.2391: cannot build when __QNXNTO__ is defined

Commit: https://github.com/vim/vim/commit/c95e8d649045add4e77b423bc159dc0d845af559
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Dec 5 18:35:44 2019 +0100

    patch 8.1.2391: cannot build when __QNXNTO__ is defined

    Problem:    Cannot build when __QNXNTO__ is defined. (Ian Wayne Larson)
    Solution:   Move the check for "qansi". (Ken Takata, closes https://github.com/vim/vim/issues/5317)

diff --git a/src/highlight.c b/src/highlight.c
--- a/src/highlight.c
+++ b/src/highlight.c
@@ -559,10 +559,12 @@ lookup_color(int idx, int foreground, in
     {
 	// t_Co is 8: use the 8 colors table
 #if defined(__QNXNTO__)
-	color = color_numbers_8_qansi[idx];
-#else
-	color = color_numbers_8[idx];
+	// On qnx, the 8 & 16 color arrays are the same
+	if (STRNCMP(T_NAME, "qansi", 5) == 0)
+	    color = color_numbers_16[idx];
+	else
 #endif
+	    color = color_numbers_8[idx];
 	if (foreground)
 	{
 	    // set/reset bold attribute to get light foreground
@@ -1136,13 +1138,6 @@ do_highlight(
 	    {
 		int bold = MAYBE;
 
-#if defined(__QNXNTO__)
-		static int *color_numbers_8_qansi = color_numbers_8;
-		// On qnx, the 8 & 16 color arrays are the same
-		if (STRNCMP(T_NAME, "qansi", 5) == 0)
-		    color_numbers_8_qansi = color_numbers_16;
-#endif
-
 		// reduce calls to STRICMP a bit, it can be slow
 		off = TOUPPER_ASC(*arg);
 		for (i = (sizeof(color_names) / sizeof(char *)); --i >= 0; )
@@ -3378,7 +3373,7 @@ highlight_changed(void)
 	     * bold-underlined.
 	     */
 	    attr = 0;
-	    for ( ; *p && *p != ','; ++p)	    // parse upto comma
+	    for ( ; *p && *p != ','; ++p)	    // parse up to comma
 	    {
 		if (VIM_ISWHITE(*p))		    // ignore white space
 		    continue;
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2391,
+/**/
     2390,
 /**/
     2389,