ncurses 6.1 - patch 20191116

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

diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index 6b4d4ecf3f54a45a05fc30242187800474b03092..ffdd4932183e6befea4fb98c0713da4645d3c9c2 100644 (file)
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2016,2018 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -70,12 +70,12 @@
 #  include <sys/select.h>
 # endif
 #endif
 #  include <sys/select.h>
 # endif
 #endif

-#ifdef __MINGW32__
+#ifdef _WIN32

 #  include <sys/time.h>
 #endif
 #undef CUR
 
 #  include <sys/time.h>
 #endif
 #undef CUR
 

-MODULE_ID("$Id: lib_twait.c,v 1.71 2016/05/28 23:32:40 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.73 2018/06/23 21:35:06 tom Exp $")

 
 static long
 _nc_gettime(TimeType * t0, int first)
 
 static long
 _nc_gettime(TimeType * t0, int first)


@@ -197,6 +197,10 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
 
     long starttime, returntime;
 
 
     long starttime, returntime;
 

+#ifdef NCURSES_WGETCH_EVENTS
+    (void) timeout_is_event;
+#endif
+

     TR(TRACE_IEVENT, ("start twait: %d milliseconds, mode: %d",
                      milliseconds, mode));
 
     TR(TRACE_IEVENT, ("start twait: %d milliseconds, mode: %d",
                      milliseconds, mode));