ncurses 6.5 - patch 20240504

[ncurses.git] / ncurses / tty / lib_twait.c

diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index c698110afce2fc6240994f53f04f0cfe9b236537..6fa73eedb4cedc06b0b301fffde2371f0e92cee7 100644 (file)
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -76,7 +76,7 @@
 #endif
 #undef CUR
 
-MODULE_ID("$Id: lib_twait.c,v 1.79 2023/02/25 21:59:30 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.81 2023/09/16 16:30:40 tom Exp $")
 
 /*
  * Returns an elapsed time, in milliseconds (if possible).
@@ -100,8 +100,8 @@ _nc_gettime(TimeType * t0, int first)
            t1.sub_secs += TimeScale;
            t1.tv_sec--;
        }
-       res = (t1.tv_sec - t0->tv_sec) * 1000L
-           + (t1.sub_secs - t0->sub_secs) / (TimeScale / 1000L);
+       res = (long) ((t1.tv_sec - t0->tv_sec) * 1000L
+                     + (t1.sub_secs - t0->sub_secs) / (TimeScale / 1000L));
     }
 #else
     time_t t1 = time((time_t *) 0);
@@ -360,7 +360,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
     if ((mode & TW_MOUSE)
        && (fd = sp->_mouse_fd) >= 0) {
        FD_SET(fd, &set);
-       count = max(fd, count) + 1;
+       count = Max(fd, count) + 1;
     }
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & TW_EVENT) && evl) {
@@ -370,7 +370,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
            if (ev->type == _NC_EVENT_FILE
                && (ev->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
                FD_SET(ev->data.fev.fd, &set);
-               count = max(ev->data.fev.fd + 1, count);
+               count = Max(ev->data.fev.fd + 1, count);
            }
        }
     }