patch 8.2.0842: MS-Windows: channel tests fail

Problem:    MS-Windows: channel tests fail.
Solution:   Adjust #ifdefs. (closes #6162)

diff --git a/src/channel.c b/src/channel.c
index 6f182c15d16b4e5c7740c019c7a79edff14c2c72..d11b148a89a2bc68df7324a83b4917e7756f7302 100644 (file)
--- 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 24ed70ebd10a908936c0804c5e014290d7f07529..641b3757f81a60afaf229a4d8796bf6ed74423a6 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    842,
 /**/
     841,
 /**/