patch 7.4.1193

Problem:    Can't build the channel feature on MS-Windows.
Solution:   Add #ifdef HAVE_POLL.

diff --git a/src/channel.c b/src/channel.c
index 952123c539a3dec3b6b84cd2b3eb3869bc023f8e..c18f25e2634721198c2374e9a058ad95e9f00be4 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -726,12 +726,14 @@ channel_wait(int fd, int timeout)
        break;
     }
 #else
+# ifdef HAVE_POLL
     struct pollfd      fds;
 
     fds.fd = fd;
     fds.events = POLLIN;
     if (poll(&fds, 1, timeout) <= 0)
        return FAIL;
+# endif
 #endif
     return OK;
 }

diff --git a/src/version.c b/src/version.c
index d9b9ebab993f9a521f499b6cc65aa67ca22cf74a..98c499a925a1aeb9cb386206b44d9ecd9dbb52d2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1193,
 /**/
     1192,
 /**/