X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fxmas.c;h=087fcd9d81d11b99b3435461c81be9b23e2c2135;hp=c1ffb3c71614d9de5529a10f338190c363c87216;hb=aefc1659d732acf7e62c0c78a443d6d8352a3c6e;hpb=92e187a3459ab7ce1613a3684ca6642447c73620

diff --git a/test/xmas.c b/test/xmas.c
index c1ffb3c7..087fcd9d 100644
--- a/test/xmas.c
+++ b/test/xmas.c
@@ -92,7 +92,7 @@
 /******************************************************************************/
 
 /*
- * $Id: xmas.c,v 1.26 2010/05/01 18:29:50 tom Exp $
+ * $Id: xmas.c,v 1.28 2013/04/27 19:46:53 tom Exp $
  */
 #include <test.priv.h>
 
@@ -148,17 +148,17 @@ static int strng5(void);
 static int reindeer(void);
 static int blinkit(void);
 
-static RETSIGTYPE done(int sig) GCC_NORETURN;
+static void done(int sig) GCC_NORETURN;
 
 static void
 set_color(WINDOW *win, chtype color)
 {
     if (has_colors()) {
-	int n = (color + 1);
+	int n = (int) (color + 1);
 	if (my_pairs == 0)
-	    my_pairs = typeCalloc(bool, COLORS + 1);
+	    my_pairs = typeCalloc(bool, (size_t) (COLORS + 1));
 	if (!my_pairs[n]) {
-	    init_pair(n, color, my_bg);
+	    init_pair((short) n, (short) color, (short) my_bg);
 	    my_pairs[n] = TRUE;
 	}
 	wattroff(win, A_COLOR);
@@ -1143,7 +1143,7 @@ reindeer(void)
     return (0);
 }
 
-static RETSIGTYPE
+static void
 done(int sig GCC_UNUSED)
 {
     CATCHALL(done);