ncurses 6.0 - patch 20171223

[ncurses.git] / test / chgat.c

diff --git a/test/chgat.c b/test/chgat.c
index 1a605fdd569723f748a3d52fcdfa3134e84bc6ec..72dd48b6afff9765e4a8b48674c06d7f29fdb01f 100644 (file)
--- a/test/chgat.c
+++ b/test/chgat.c
@@ -26,7 +26,7 @@
  * authorization.                                                           *
  ****************************************************************************/
 /*
- * $Id: chgat.c,v 1.15 2017/04/16 00:47:55 tom Exp $
+ * $Id: chgat.c,v 1.17 2017/09/28 23:04:14 tom Exp $
  *
  * test-driver for chgat/wchgat/mvchgat/mvwchgat
  */
@@ -46,10 +46,10 @@
 #endif
 
 typedef struct {
-    unsigned c;
-    unsigned v;
+    size_t c;
+    size_t v;
     short pair;
-    unsigned attr;
+    attr_t attr;
     int count;
     int ch;
     const char *c_msg;
@@ -61,7 +61,7 @@ typedef struct {
 } STATUS;
 
 static const char *
-color_params(unsigned state, short *pair)
+color_params(size_t state, short *pair)
 {
     /* *INDENT-OFF* */
     static struct {
@@ -80,7 +80,7 @@ color_params(unsigned state, short *pair)
 
     if (has_colors()) {
        if (first) {
-           unsigned n;
+           size_t n;
 
            start_color();
            for (n = 0; n < SIZEOF(table); ++n) {
@@ -96,18 +96,18 @@ color_params(unsigned state, short *pair)
 }
 
 static const char *
-video_params(unsigned state, unsigned *attr)
+video_params(size_t state, attr_t *attr)
 {
     /* *INDENT-OFF* */
     static struct {
-       unsigned attr;
+       attr_t attr;
        const char *msg;
     } table[] = {
-       { A_NORMAL,     "normal" },
-       { A_BOLD,       "bold" },
-       { A_REVERSE,    "reverse" },
-       { A_UNDERLINE,  "underline" },
-       { A_BLINK,      "blink" },
+       { WA_NORMAL,    "normal" },
+       { WA_BOLD,      "bold" },
+       { WA_REVERSE,   "reverse" },
+       { WA_UNDERLINE, "underline" },
+       { WA_BLINK,     "blink" },
     };
     /* *INDENT-ON* */