ncurses 6.2 - patch 20200829

[ncurses.git] / progs / tset.c

diff --git a/progs/tset.c b/progs/tset.c
index ca0520e215a1df49b9bf1c8134bdb855724825bd..c46977c966918cb11c71d0b9bb14d2bcbb2192e8 100644 (file)
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -98,7 +98,7 @@
 char *ttyname(int fd);
 #endif
 
-MODULE_ID("$Id: tset.c,v 1.121 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.123 2020/08/29 23:32:18 tom Exp $")
 
 #ifndef environ
 extern char **environ;
@@ -133,7 +133,7 @@ exit_error(void)
 }
 
 static void
-err(const char *fmt,...)
+err(const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
@@ -227,10 +227,13 @@ static MAP *cur, *maplist;
 #define DATA(name,value) { { name }, value }
 
 typedef struct speeds {
-    const char string[7];
+    const char string[8];
     int speed;
 } SPEEDS;
 
+#if (defined(_WIN32) || defined(_WIN64))
+static const SPEEDS speeds[] = { { "0", 0 } };
+#else
 static const SPEEDS speeds[] =
 {
     DATA("0", B0),
@@ -331,6 +334,7 @@ static const SPEEDS speeds[] =
 #endif
 };
 #undef DATA
+#endif
 
 static int
 tbaudrate(char *rate)
@@ -839,6 +843,8 @@ main(int argc, char **argv)
     oldmode = mode;
 #ifdef TERMIOS
     ospeed = (NCURSES_OSPEED) cfgetospeed(&mode);
+#elif (defined(_WIN32) || defined(_WIN64))
+    ospeed = 0;
 #else
     ospeed = (NCURSES_OSPEED) mode.sg_ospeed;
 #endif