aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 7.4.1361

Browse Source 
Problem:    Channel test fails on Solaris.
Solution:   Use the 1 msec waittime for all systems.
This commit is contained in:
Bram Moolenaar
2016-02-19 23:23:12 +01:00
parent 0ba75a9714
commit 254e00d714
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/channel.c
View File

@@ -538,12 +538,11 @@ channel_open(char *hostname, int port_in, int waittime, void (*close_cb)(void))
} }
memcpy((char *)&server.sin_addr, host->h_addr, host->h_length); memcpy((char *)&server.sin_addr, host->h_addr, host->h_length);
#if defined(__APPLE__) && __APPLE__ == 1 /* On Mac and Solaris a zero timeout almost never works. At least wait
/* On Mac a zero timeout almost never works. At least wait one * one millisecond. Let's do it for all systems, because we don't know why
* millisecond. */ * this is needed. */
if (waittime == 0) if (waittime == 0)
waittime = 1; waittime = 1;
#endif
/* /*
* For Unix we need to call connect() again after connect() failed. * For Unix we need to call connect() again after connect() failed.

2
src/version.c
View File

@@ -747,6 +747,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 */
/**/
1361,
/**/ /**/
1360, 1360,
/**/ /**/