X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fblue.c;h=5402c4f9ef1b35c419e39fbd5e114574ffc9786e;hp=45fce074d3c2fe68e42113141d156937a7ea7e7c;hb=bdb754b9f04f332b59d72f761a297497b2db8af1;hpb=11dcb05d1b3076f114ee807bd68cee1cfadff7dc

diff --git a/test/blue.c b/test/blue.c
index 45fce074..5402c4f9 100644
--- a/test/blue.c
+++ b/test/blue.c
@@ -36,7 +36,7 @@
  *****************************************************************************/
 
 /*
- * $Id: blue.c,v 1.42 2016/04/09 23:55:52 tom Exp $
+ * $Id: blue.c,v 1.45 2016/06/12 00:17:37 tom Exp $
  */
 
 #include <test.priv.h>
@@ -105,7 +105,7 @@ static int letters[4] =
     'c',			/* clubs */
 };
 
-#ifdef HAVE_LANGINFO_CODESET
+#if HAVE_LANGINFO_CODESET
 
 #if HAVE_TIGETSTR
 static int glyphs[] =
@@ -202,14 +202,14 @@ printcard(int value)
     } else {
 	int which = (value / SUIT_LENGTH);
 	int isuit = (value % SUIT_LENGTH);
-	attr_t color = COLOR_PAIR(((which % 2) == 0)
-				  ? RED_ON_WHITE
-				  : BLACK_ON_WHITE);
+	attr_t color = (attr_t) COLOR_PAIR(((which % 2) == 0)
+					   ? RED_ON_WHITE
+					   : BLACK_ON_WHITE);
 
 	addch(ranks[isuit][0] | (chtype) COLOR_PAIR(BLUE_ON_WHITE));
 	addch(ranks[isuit][1] | (chtype) COLOR_PAIR(BLUE_ON_WHITE));
 
-	attr_on(color, NULL);
+	attron(color);
 #if USE_WIDEC_SUPPORT
 	{
 	    wchar_t values[2];
@@ -220,7 +220,7 @@ printcard(int value)
 #else
 	addch((chtype) suits[which]);
 #endif
-	attr_off(color, NULL);
+	attroff(color);
     }
     (void) addch(' ');
 }