nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-06-30 19:12:48 -05:00
Code Issues Projects Releases Wiki Activity

Merge from trunk up to r8020.

Browse Source 
[originally from svn r8021]
[r8020 == 14d825d42f]
This commit is contained in:
Simon Tatham
2008-05-28 19:28:17 +00:00
parent cb18f9a6eb 14d825d42f
commit 85c227326c
8 changed files with 68 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
windows/winnet.c
View File

@ -1637,7 +1637,8 @@ int net_service_lookup(char *service)
return 0;
}
SockAddr platform_get_x11_unix_address(int displaynum, char **canonicalname)
SockAddr platform_get_x11_unix_address(const char *display, int displaynum,
char **canonicalname)
{
SockAddr ret = snew(struct SockAddr_tag);
memset(ret, 0, sizeof(struct SockAddr_tag));