Merge branch 'kd/auto-col-with-pager-fix' into maint

diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index db4e03ed793eead425f2fa53c2a1777b1401269a..ae03b74a6f4e9c8ff6d519d9a784ab6b84179872 100644 (file)
--- a/compat/poll/poll.c
+++ b/compat/poll/poll.c
@@ -76,7 +76,7 @@
 
 #ifdef WIN32_NATIVE
 
-#define IsConsoleHandle(h) (((long) (h) & 3) == 3)
+#define IsConsoleHandle(h) (((long) (intptr_t) (h) & 3) == 3)
 
 static BOOL
 IsSocketHandle (HANDLE h)
@@ -438,6 +438,10 @@ poll (struct pollfd *pfd, nfds_t nfd, int timeout)
            pfd[i].revents = happened;
            rc++;
          }
+       else
+         {
+           pfd[i].revents = 0;
+         }
       }
 
   return rc;