Mercurial > vim
comparison src/channel.c @ 8134:8abef552ece7 v7.4.1361
commit https://github.com/vim/vim/commit/254e00d71429aa4e71b93d3e8c6bb93bfebe4f26
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Feb 19 23:23:12 2016 +0100
patch 7.4.1361
Problem: Channel test fails on Solaris.
Solution: Use the 1 msec waittime for all systems.
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 19 Feb 2016 23:45:04 +0100 |
parents | f96536c291d8 |
children | aa845d10c6fb |
comparison
equal
deleted
inserted
replaced
8133:ea8dc9e33ecd | 8134:8abef552ece7 |
---|---|
536 channel_free(channel); | 536 channel_free(channel); |
537 return NULL; | 537 return NULL; |
538 } | 538 } |
539 memcpy((char *)&server.sin_addr, host->h_addr, host->h_length); | 539 memcpy((char *)&server.sin_addr, host->h_addr, host->h_length); |
540 | 540 |
541 #if defined(__APPLE__) && __APPLE__ == 1 | 541 /* On Mac and Solaris a zero timeout almost never works. At least wait |
542 /* On Mac a zero timeout almost never works. At least wait one | 542 * one millisecond. Let's do it for all systems, because we don't know why |
543 * millisecond. */ | 543 * this is needed. */ |
544 if (waittime == 0) | 544 if (waittime == 0) |
545 waittime = 1; | 545 waittime = 1; |
546 #endif | |
547 | 546 |
548 /* | 547 /* |
549 * For Unix we need to call connect() again after connect() failed. | 548 * For Unix we need to call connect() again after connect() failed. |
550 * On Win32 one time is sufficient. | 549 * On Win32 one time is sufficient. |
551 */ | 550 */ |