ncurses 6.0

[ncurses.git] / test / tclock.c

diff --git a/test/tclock.c b/test/tclock.c
index fdcb446b58a78215f69322bf31951696eaa8e3f7..96e1d19f6669e21b131be0984078b6f0cfbb99f1 100644 (file)
--- a/test/tclock.c
+++ b/test/tclock.c
@@ -1,7 +1,9 @@
-/* $Id: tclock.c,v 1.29 2010/11/14 01:04:52 tom Exp $ */
+/* $Id: tclock.c,v 1.34 2014/08/02 16:37:03 tom Exp $ */
 
 #include <test.priv.h>
 
+#if HAVE_MATH_H
+
 #include <math.h>
 
 #if TIME_WITH_SYS_TIME
@@ -51,14 +53,14 @@
 
 /* Plot a point */
 static void
-plot(int x, int y, char col)
+plot(int x, int y, int col)
 {
     MvAddCh(y, x, (chtype) col);
 }
 
 /* Draw a diagonal(arbitrary) line using Bresenham's alogrithm. */
 static void
-dline(int pair, int from_x, int from_y, int x2, int y2, char ch)
+dline(int pair, int from_x, int from_y, int x2, int y2, int ch)
 {
     int dx, dy;
     int ax, ay;
@@ -67,7 +69,7 @@ dline(int pair, int from_x, int from_y, int x2, int y2, char ch)
     int d;
 
     if (has_colors())
-       (void) attrset((attr_t) COLOR_PAIR(pair));
+       (void) attrset(AttrArg(COLOR_PAIR(pair), 0));
 
     dx = x2 - from_x;
     dy = y2 - from_y;
@@ -133,8 +135,8 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
     short my_bg = COLOR_BLACK;
 #if HAVE_GETTIMEOFDAY
     struct timeval current;
-    double fraction = 0.0;
 #endif
+    double fraction = 0.0;
 
     setlocale(LC_ALL, "");
 
@@ -214,12 +216,12 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
        attroff(A_REVERSE);
 
        if (has_colors())
-           (void) attrset(COLOR_PAIR(1));
+           (void) attrset(AttrArg(COLOR_PAIR(1), 0));
 
        dline(1, cx, cy, cx + sdx, cy - sdy, 'O');
 
        if (has_colors())
-           (void) attrset(COLOR_PAIR(0));
+           (void) attrset(AttrArg(COLOR_PAIR(0), 0));
 
        text = ctime(&tim);
        MvPrintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);
@@ -256,3 +258,11 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
     endwin();
     ExitProgram(EXIT_SUCCESS);
 }
+#else
+int
+main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+{
+    printf("This program requires the development header math.h\n");
+    ExitProgram(EXIT_FAILURE);
+}
+#endif