From 8c227b0cc0f95dbe7937ea635c914d0a0abe2e44 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 29 Jan 2020 06:13:41 +0000 Subject: [PATCH] Fix misdef of platform_get_x11_unix_address on Windows. Similarly to the previous commit, this function had an inconsistent parameter list between Unix and Windows, because the Windows source file that defines it (winnet.c) didn't include ssh.h where its prototype lives, so the compiler never checked. Luckily, the discrepancy was that the Windows version of the function was declared as taking an extra parameter which it ignored, so the fix is very easy. (cherry picked from commit b7f011aed74a6f0442571da4f15c794c7adff99c) --- windows/winnet.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/windows/winnet.c b/windows/winnet.c index ab38e547..16648d56 100644 --- a/windows/winnet.c +++ b/windows/winnet.c @@ -1817,8 +1817,7 @@ char *get_hostname(void) return dupstr(hostbuf); } -SockAddr *platform_get_x11_unix_address(const char *display, int displaynum, - char **canonicalname) +SockAddr *platform_get_x11_unix_address(const char *display, int displaynum) { SockAddr *ret = snew(SockAddr); memset(ret, 0, sizeof(SockAddr));