diff options
author | Bram Moolenaar <Bram@vim.org> | 2020-05-30 13:07:39 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2020-05-30 13:07:39 +0200 |
commit | 208534d9ae6e8dec5baff90440b58c63f0b37981 (patch) | |
tree | 5fa7d514fcc7472fa5e8523d7194ee4b6c3aab90 /src | |
parent | 823654bc06c847af20967d41db32d592aba416cb (diff) | |
download | vim-git-208534d9ae6e8dec5baff90440b58c63f0b37981.tar.gz |
patch 8.2.0842: MS-Windows: channel tests failv8.2.0842
Problem: MS-Windows: channel tests fail.
Solution: Adjust #ifdefs. (closes #6162)
Diffstat (limited to 'src')
-rw-r--r-- | src/channel.c | 6 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/channel.c b/src/channel.c index 6f182c15d..d11b148a8 100644 --- 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 index 24ed70ebd..641b3757f 100644 --- 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, |