Permalink
Browse files

patch 8.0.0959: build failure on MS-Windows

Problem:    Build failure on MS-Windows.
Solution:   Use ioctlsocket() instead of fcntl().
  • Loading branch information...
brammool committed Aug 18, 2017
1 parent ea5d6fa commit f66a2cda2c425c441fc5e20c8f8893c9630e3aaa
Showing with 7 additions and 8 deletions.
  1. +5 −8 src/channel.c
  2. +2 −0 src/version.c
View
@@ -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)
View
@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
959,
/**/
958,
/**/

0 comments on commit f66a2cd

Please sign in to comment.