Fix/bludgeon Mac compile wrinkles.

[originally from svn r5154]

diff --git a/cproxy.c b/cproxy.c
index 7efcc234b446d6fbda1e4a5fde34a2d9ce917b0d..bf5eed5de4739b1493907a90daac058dc72a98d9 100644 (file)
--- 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 0eec121114cbc23a8bd333de2eb89ad81ce3babf..17ab3a255d73c879cdfda45c252bde40c8a35719 100644 (file)
--- 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