From 11a60120eed82422fee571d92bb31b9d2746498c Mon Sep 17 00:00:00 2001 From: owen Date: Thu, 20 Jan 2005 16:42:25 +0000 Subject: [PATCH] Fix/bludgeon Mac compile wrinkles. git-svn-id: svn://svn.tartarus.org/sgt/putty@5154 cda61777-01e9-0310-a592-d414129be87e --- cproxy.c | 2 +- x11fwd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cproxy.c b/cproxy.c index 7efcc234b..bf5eed5de 100644 --- a/cproxy.c +++ b/cproxy.c @@ -131,7 +131,7 @@ int proxy_socks5_handlechap (Proxy_Socket p) outbuf[3] = 0x10; /* Length */ hmacmd5_chap(data, p->chap_current_datalen, p->cfg.proxy_password, &outbuf[4]); - sk_write(p->sub_socket, outbuf, 20); + sk_write(p->sub_socket, (char *)outbuf, 20); break; case 0x11: /* Chose a protocol */ diff --git a/x11fwd.c b/x11fwd.c index 0eec12111..17ab3a255 100644 --- a/x11fwd.c +++ b/x11fwd.c @@ -241,7 +241,7 @@ char *x11_display(const char *display) { char *ret; if(!display || !*display) { /* try to find platform-specific local display */ - if(!(ret = platform_get_x_display())) + if((ret = platform_get_x_display())==0) /* plausible default for all platforms */ ret = dupstr(":0"); } else