From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 18 Aug 2017 19:53:22 +0000 (+0200)
Subject: patch 8.0.0959: build failure on MS-Windows
X-Git-Tag: v8.0.0959
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f66a2cda2c425c441fc5e20c8f8893c9630e3aaa;p=vim

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 fab35899a..9a14e1ed3 100644
--- 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 903b13ee5..7b17219fe 100644
--- 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,
 /**/