changeset 20577:5f0f1f63c8df v8.2.0842

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)
author Bram Moolenaar <Bram@vim.org>
date Sat, 30 May 2020 13:15:03 +0200
parents dbb4a66f4ef4
children 6423f8692351
files src/channel.c src/version.c
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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));
--- 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,