thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0959: build failure on MS-Windows

Browse Source 
Problem:    Build failure on MS-Windows.
Solution:   Use ioctlsocket() instead of fcntl().
This commit is contained in:
Bram Moolenaar
2017-08-18 21:53:22 +02:00
parent ea5d6fadbb
commit f66a2cda2c
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/channel.c
View File

@@ -3542,6 +3542,7 @@ channel_handle_events(void)
/* /*
* Set "channel"/"part" to non-blocking. * Set "channel"/"part" to non-blocking.
* Only works for sockets and pipes.
*/ */
void void
channel_set_nonblock(channel_T *channel, ch_part_T part) 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) if (fd != INVALID_FD)
{ {
#ifdef _WIN32 #ifdef _WIN32
if (part == PART_SOCK) u_long val = 1;
{
u_long val = 1;
ioctlsocket(fd, FIONBIO, &val); ioctlsocket(fd, FIONBIO, &val);
} #else
else fcntl(fd, F_SETFL, O_NONBLOCK);
#endif #endif
fcntl(fd, F_SETFL, O_NONBLOCK);
ch_part->ch_nonblocking = TRUE; ch_part->ch_nonblocking = TRUE;
} }
} }
@@ -3706,7 +3704,6 @@ channel_send(
if (last != NULL) if (last != NULL)
{ {
ch_log(channel, "Creating new entry");
last->wq_prev = wq->wq_prev; last->wq_prev = wq->wq_prev;
last->wq_next = NULL; last->wq_next = NULL;
if (wq->wq_prev == NULL) if (wq->wq_prev == NULL)

2
src/version.c
View File

@@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
959,
/**/ /**/
958, 958,
/**/ /**/