X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fcolor_set.c;h=477d049c8b5e431f721caa961c669f5a561f44bb;hp=8d8d4b090cdebf8a2b0f3bc7afa280b17387b6b7;hb=d66080c21038ad4feb2e41a0c4e517d5b4a03ab2;hpb=027ae42953e3186daed8f3882da73de48291b606

diff --git a/test/color_set.c b/test/color_set.c
index 8d8d4b09..477d049c 100644
--- a/test/color_set.c
+++ b/test/color_set.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2003-2004,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 2003-2012,2014 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -26,19 +26,19 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: color_set.c,v 1.5 2006/06/03 16:40:10 tom Exp $
+ * $Id: color_set.c,v 1.8 2014/02/01 22:10:42 tom Exp $
  */
 
 #include <test.priv.h>
 
-#ifdef HAVE_COLOR_SET
+#if HAVE_COLOR_SET
 
 #define SHOW(n) ((n) == ERR ? "ERR" : "OK")
 
 int
 main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 {
-    short f, b;
+    NCURSES_COLOR_T f, b;
     int i;
 
     initscr();
@@ -48,8 +48,8 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
     if (has_colors()) {
 	start_color();
 
-	pair_content(0, &f, &b);
-	printw("pair 0 contains (%d,%d)\n", f, b);
+	(void) pair_content(0, &f, &b);
+	printw("pair 0 contains (%d,%d)\n", (int) f, (int) b);
 	getch();
 
 	printw("Initializing pair 1 to red/black\n");