# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1590837303 -7200
# Node ID 5f0f1f63c8df7941d2ccd73fa829a26cd9f37ce2
# Parent  dbb4a66f4ef424e45486e63f2a714ca7029f14ca
patch 8.2.0842: MS-Windows: channel tests fail

Commit: https://github.com/vim/vim/commit/208534d9ae6e8dec5baff90440b58c63f0b37981
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat May 30 13:07:39 2020 +0200

    patch 8.2.0842: MS-Windows: channel tests fail

    Problem:    MS-Windows: channel tests fail.
    Solution:   Adjust #ifdefs. (closes https://github.com/vim/vim/issues/6162)

diff --git a/src/channel.c b/src/channel.c
--- a/src/channel.c
+++ b/src/channel.c
@@ -1002,21 +1002,27 @@ channel_open(
 # ifdef HAVE_INET_NTOP
 	const void  *src = NULL;
 	char	    buf[NUMBUFLEN];
+# endif
 
 	if (addr->ai_family == AF_INET6)
 	{
 	    struct sockaddr_in6 *sai = (struct sockaddr_in6 *)addr->ai_addr;
 
 	    sai->sin6_port = htons(port);
+# ifdef HAVE_INET_NTOP
 	    src = &sai->sin6_addr;
+# endif
 	}
 	else if (addr->ai_family == AF_INET)
 	{
 	    struct sockaddr_in *sai = (struct sockaddr_in *)addr->ai_addr;
 
 	    sai->sin_port = htons(port);
+# ifdef HAVE_INET_NTOP
 	    src = &sai->sin_addr;
+#endif
 	}
+# ifdef HAVE_INET_NTOP
 	if (src != NULL)
 	{
 	    dst = inet_ntop(addr->ai_family, src, buf, sizeof(buf));
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    842,
+/**/
     841,
 /**/
     840,