X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ftclock.c;h=fb44725d3209c1244914cda330e0a4ed248f0d82;hp=394ee81385b0d25347d31d5deb7b2f9fe4898e02;hb=03f728e5bb3630a54fffc4a2ff2f8dbfcce9088e;hpb=55ccd2b959766810cf7db8d1c4462f338ce0afc8

diff --git a/test/tclock.c b/test/tclock.c
index 394ee813..fb44725d 100644
--- a/test/tclock.c
+++ b/test/tclock.c
@@ -1,7 +1,9 @@
-/* $Id: tclock.c,v 1.25 2005/04/16 16:39:27 tom Exp $ */
+/* $Id: tclock.c,v 1.30 2011/03/22 09:16:00 tom Exp $ */
 
 #include <test.priv.h>
 
+#if HAVE_MATH_H
+
 #include <math.h>
 
 #if TIME_WITH_SYS_TIME
@@ -53,7 +55,7 @@
 static void
 plot(int x, int y, char col)
 {
-    mvaddch(y, x, (chtype) col);
+    MvAddCh(y, x, (chtype) col);
 }
 
 /* Draw a diagonal(arbitrary) line using Bresenham's alogrithm. */
@@ -67,7 +69,7 @@ dline(int pair, int from_x, int from_y, int x2, int y2, char ch)
     int d;
 
     if (has_colors())
-	attrset(COLOR_PAIR(pair));
+	(void) attrset((attr_t) COLOR_PAIR(pair));
 
     dx = x2 - from_x;
     dy = y2 - from_y;
@@ -130,7 +132,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
     struct tm *t;
     char szChar[10];
     char *text;
-    int my_bg = COLOR_BLACK;
+    short my_bg = COLOR_BLACK;
 #if HAVE_GETTIMEOFDAY
     struct timeval current;
     double fraction = 0.0;
@@ -175,10 +177,10 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 	sdy = A2Y(sangle, sradius);
 	sprintf(szChar, "%d", i + 1);
 
-	mvaddstr(cy - sdy, cx + sdx, szChar);
+	MvAddStr(cy - sdy, cx + sdx, szChar);
     }
 
-    mvaddstr(0, 0, "ASCII Clock by Howard Jones (ha.jones@ic.ac.uk),1994");
+    MvAddStr(0, 0, "ASCII Clock by Howard Jones (ha.jones@ic.ac.uk),1994");
 
     sradius = (4 * sradius) / 5;
     for (;;) {
@@ -201,7 +203,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
 #if HAVE_GETTIMEOFDAY
 	gettimeofday(&current, 0);
-	fraction = (current.tv_usec / 1.0e6);
+	fraction = ((double) current.tv_usec / 1.0e6);
 #endif
 	sangle = ((t->tm_sec + fraction) * (2.0 * PI) / 60.0);
 	sdx = A2X(sangle, sradius);
@@ -209,20 +211,20 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
 	dline(3, cx, cy, cx + mdx, cy - mdy, '#');
 
-	attrset(A_REVERSE);
+	(void) attrset(A_REVERSE);
 	dline(2, cx, cy, cx + hdx, cy - hdy, '.');
 	attroff(A_REVERSE);
 
 	if (has_colors())
-	    attrset(COLOR_PAIR(1));
+	    (void) attrset(COLOR_PAIR(1));
 
 	dline(1, cx, cy, cx + sdx, cy - sdy, 'O');
 
 	if (has_colors())
-	    attrset(COLOR_PAIR(0));
+	    (void) attrset(COLOR_PAIR(0));
 
 	text = ctime(&tim);
-	mvprintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);
+	MvPrintw(2, 0, "%.*s", (int) (strlen(text) - 1), text);
 	refresh();
 	if ((t->tm_sec % 5) == 0
 	    && t->tm_sec != lastbeep) {
@@ -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