Cleanups of the GSSAPI support. On Windows, standard GSS libraries

[u/mdw/putty] / mac / macnet.c

diff --git a/mac/macnet.c b/mac/macnet.c
index 63d0cc4..fc022dc 100644 (file)
--- a/mac/macnet.c
+++ b/mac/macnet.c
@@ -1,6 +1,7 @@
 #include "putty.h"
 #include "network.h"
 #include "mac.h"
+#include "ssh.h"
 
 struct macnet_stack {
     SockAddr (*namelookup)(char const *, char **);
@@ -13,7 +14,7 @@ struct macnet_stack {
     void (*addr_free)(SockAddr);
     Socket (*skregister)(void *, Plug); /* "register" is a reserved word */
     Socket (*new)(SockAddr, int, int, int, int, int, Plug);
-    Socket (*newlistener)(char *, int, Plug, int);
+    Socket (*newlistener)(char *, int, Plug, int, int);
     char *(*addr_error)(SockAddr);
     void (*poll)(void);
     void (*cleanup)(void);
@@ -39,7 +40,7 @@ static struct macnet_stack mactcp = {
 void sk_init(void)
 {
 
-#if 0
+#ifndef NO_OT
     if (ot_init() == noErr)
        stack = &ot;
     else
@@ -141,7 +142,7 @@ Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, i
 {
 
     if (stack != NULL)
-       return stack->newlistener(srcaddr, port, plug, local_host_only);
+       return stack->newlistener(srcaddr, port, plug, local_host_only, address_family);
     return NULL;
 }
 
@@ -174,6 +175,11 @@ int net_service_lookup(char *service)
     return 0;
 }
 
+SockAddr platform_get_x11_unix_address(const char *display, int displaynum,
+                                      char **canonicalname)
+{
+    return NULL;
+}
 
 /*
  * Local Variables: