aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

patch 8.2.0842: MS-Windows: channel tests fail

Browse Source 
Problem:    MS-Windows: channel tests fail.
Solution:   Adjust #ifdefs. (closes #6162)
This commit is contained in:
Bram Moolenaar 2020-05-30 13:07:39 +02:00
parent 823654bc06
commit 208534d9ae
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/channel.c
View File

@ -1002,21 +1002,27 @@ channel_open(
# ifdef HAVE_INET_NTOP # ifdef HAVE_INET_NTOP
const void *src = NULL; const void *src = NULL;
char buf[NUMBUFLEN]; char buf[NUMBUFLEN];
# endif
if (addr->ai_family == AF_INET6) if (addr->ai_family == AF_INET6)
{ {
struct sockaddr_in6 *sai = (struct sockaddr_in6 *)addr->ai_addr; struct sockaddr_in6 *sai = (struct sockaddr_in6 *)addr->ai_addr;
sai->sin6_port = htons(port); sai->sin6_port = htons(port);
# ifdef HAVE_INET_NTOP
src = &sai->sin6_addr; src = &sai->sin6_addr;
# endif
} }
else if (addr->ai_family == AF_INET) else if (addr->ai_family == AF_INET)
{ {
struct sockaddr_in *sai = (struct sockaddr_in *)addr->ai_addr; struct sockaddr_in *sai = (struct sockaddr_in *)addr->ai_addr;
sai->sin_port = htons(port); sai->sin_port = htons(port);
# ifdef HAVE_INET_NTOP
src = &sai->sin_addr; src = &sai->sin_addr;
#endif
} }
# ifdef HAVE_INET_NTOP
if (src != NULL) if (src != NULL)
{ {
dst = inet_ntop(addr->ai_family, src, buf, sizeof(buf)); dst = inet_ntop(addr->ai_family, src, buf, sizeof(buf));

2
src/version.c
View File

@ -746,6 +746,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
842,
/**/ /**/
841, 841,
/**/ /**/