ncurses 6.0 - patch 20160528

[ncurses.git] / test / test_sgr.c

diff --git a/test/test_sgr.c b/test/test_sgr.c
index cff9d0d2d9be03c1bf42b5dc7d87fdeffaa5f799..b113e63fdf4c281f1a7730bc46dc72262367c8b4 100644 (file)
--- a/test/test_sgr.c
+++ b/test/test_sgr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2015 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2015,2016 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            *
@@ -29,13 +29,14 @@
 /*
  * Author: Thomas E. Dickey
  *
- * $Id: test_sgr.c,v 1.4 2015/11/21 22:43:50 tom Exp $
+ * $Id: test_sgr.c,v 1.6 2016/02/13 22:08:16 tom Exp $
  *
  * A simple demo of the sgr/sgr0 terminal capabilities.
  */
 #define USE_TINFO
 #include <test.priv.h>
 
+#if !HAVE_TIGETSTR
 static void failed(const char *) GCC_NORETURN;
 
 static void
@@ -44,6 +45,7 @@ failed(const char *msg)
     fprintf(stderr, "%s\n", msg);
     ExitProgram(EXIT_FAILURE);
 }
+#endif
 
 #if HAVE_TIGETSTR
 
@@ -146,7 +148,7 @@ dumpit(unsigned bits, unsigned ignore, const char *sgr, const char *sgr0)
     printf("%4d ", bits);
     bits &= ~ignore;
     for (n = 0; n < MAXPAR; ++n) {
-       putchar((bits & (1 << n)) ? params[n] : '-');
+       putchar((int) ((bits & (unsigned) (1 << n)) ? params[n] : '-'));
     }
     putchar(' ');
     putp(sgr);
@@ -236,7 +238,7 @@ brute_force(const char *name)
            }
        }
        for (j = 0; j < MAXPAR; ++j) {
-           unsigned mask = (1 << j);
+           unsigned mask = (unsigned) (1 << j);
            for (count = 0; count < MAXSGR; ++count) {
                if ((count & mask) != 0)
                    continue;