# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1455921904 -3600
# Node ID 8abef552ece7794df0e4f46ec5b8b731bf11aa46
# Parent  ea8dc9e33ecd2105ed78572e2dc2a353495c298f
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.

diff --git a/src/channel.c b/src/channel.c
--- a/src/channel.c
+++ b/src/channel.c
@@ -538,12 +538,11 @@ channel_open(char *hostname, int port_in
     }
     memcpy((char *)&server.sin_addr, host->h_addr, host->h_length);
 
-#if defined(__APPLE__) && __APPLE__ == 1
-    /* On Mac a zero timeout almost never works.  At least wait one
-     * millisecond. */
+    /* On Mac and Solaris a zero timeout almost never works.  At least wait
+     * one millisecond. Let's do it for all systems, because we don't know why
+     * this is needed. */
     if (waittime == 0)
 	waittime = 1;
-#endif
 
     /*
      * For Unix we need to call connect() again after connect() failed.
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1361,
+/**/
     1360,
 /**/
     1359,