patch 8.0.0959: build failure on MS-Windows

Problem:    Build failure on MS-Windows.
Solution:   Use ioctlsocket() instead of fcntl().

diff --git a/src/channel.c b/src/channel.c
index fab35899a4a1bba4e0a61ebe0f22da0cb2113479..9a14e1ed3ff98004d1ede55d0bcbef70060669d8 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -3542,6 +3542,7 @@ channel_handle_events(void)
 
 /*
  * Set "channel"/"part" to non-blocking.
+ * Only works for sockets and pipes.
  */
     void
 channel_set_nonblock(channel_T *channel, ch_part_T part)
@@ -3552,15 +3553,12 @@ channel_set_nonblock(channel_T *channel, ch_part_T part)
     if (fd != INVALID_FD)
     {
 #ifdef _WIN32
-       if (part == PART_SOCK)
-       {
-           u_long      val = 1;
+       u_long  val = 1;
 
-           ioctlsocket(fd, FIONBIO, &val);
-       }
-       else
+       ioctlsocket(fd, FIONBIO, &val);
+#else
+       fcntl(fd, F_SETFL, O_NONBLOCK);
 #endif
-           fcntl(fd, F_SETFL, O_NONBLOCK);
        ch_part->ch_nonblocking = TRUE;
     }
 }
@@ -3706,7 +3704,6 @@ channel_send(
 
                    if (last != NULL)
                    {
-               ch_log(channel, "Creating new entry");
                        last->wq_prev = wq->wq_prev;
                        last->wq_next = NULL;
                        if (wq->wq_prev == NULL)

diff --git a/src/version.c b/src/version.c
index 903b13ee5b4d322b06be8e3556c0f5795c9f1cfc..7b17219fe49558fc0e48b4458899f457800271ec 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    959,
 /**/
     958,
 /**/