ncurses 6.2 - patch 20200906

[ncurses.git] / progs / tset.c

diff --git a/progs/tset.c b/progs/tset.c
index c46977c966918cb11c71d0b9bb14d2bcbb2192e8..4d33ca8789c279fb34b544210fc6a39e53dd2981 100644 (file)
--- a/progs/tset.c
+++ b/progs/tset.c
@@ -98,7 +98,7 @@
 char *ttyname(int fd);
 #endif
 
 char *ttyname(int fd);
 #endif
 

-MODULE_ID("$Id: tset.c,v 1.123 2020/08/29 23:32:18 tom Exp $")
+MODULE_ID("$Id: tset.c,v 1.125 2020/09/05 22:54:47 tom Exp $")

 
 #ifndef environ
 extern char **environ;
 
 #ifndef environ
 extern char **environ;


@@ -231,8 +231,11 @@ typedef struct speeds {
     int speed;
 } SPEEDS;
 
     int speed;
 } SPEEDS;
 

-#if (defined(_WIN32) || defined(_WIN64))
-static const SPEEDS speeds[] = { { "0", 0 } };
+#if defined(EXP_WIN32_DRIVER)
+static const SPEEDS speeds[] =
+{
+    {"0", 0}
+};

 #else
 static const SPEEDS speeds[] =
 {
 #else
 static const SPEEDS speeds[] =
 {


@@ -843,7 +846,7 @@ main(int argc, char **argv)
     oldmode = mode;
 #ifdef TERMIOS
     ospeed = (NCURSES_OSPEED) cfgetospeed(&mode);
     oldmode = mode;
 #ifdef TERMIOS
     ospeed = (NCURSES_OSPEED) cfgetospeed(&mode);

-#elif (defined(_WIN32) || defined(_WIN64))
+#elif defined(EXP_WIN32_DRIVER)

     ospeed = 0;
 #else
     ospeed = (NCURSES_OSPEED) mode.sg_ospeed;
     ospeed = 0;
 #else
     ospeed = (NCURSES_OSPEED) mode.sg_ospeed;