Carbonise, or at least disable MacTCP support under Carbon.

git-svn-id: svn://svn.tartarus.org/sgt/putty@2792 cda61777-01e9-0310-a592-d414129be87e

diff --git a/mac/macnet.c b/mac/macnet.c
index 34d6885..b95a1b7 100644 (file)
--- a/mac/macnet.c
+++ b/mac/macnet.c
@@ -27,12 +27,14 @@ static struct macnet_stack ot = {
     ot_register, ot_new, ot_newlistener, ot_addr_error, ot_poll, ot_cleanup
 };
 
+#if !TARGET_API_MAC_CARBON
 static struct macnet_stack mactcp = {
     mactcp_namelookup, mactcp_nonamelookup, mactcp_getaddr,
     mactcp_hostname_is_local, mactcp_address_is_local, mactcp_addrtype,
     mactcp_addrcopy, mactcp_addr_free, mactcp_register, mactcp_new,
     mactcp_newlistener, mactcp_addr_error, mactcp_poll, mactcp_cleanup
 };
+#endif
 
 void sk_init(void)
 {
@@ -42,9 +44,11 @@ void sk_init(void)
        stack = &ot;
     else
 #endif
+#if !TARGET_API_MAC_CARBON
     if (mactcp_init() == noErr)
        stack = &mactcp;
     else
+#endif
        stack = NULL;
 }
 

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index f355232..8f62f09 100644 (file)
--- a/mac/mtcpnet.c
+++ b/mac/mtcpnet.c
@@ -27,6 +27,8 @@
  * mtcpnet.c - MacTCP interface
  */
 
+#if !TARGET_API_MAC_CARBON
+
 #include <MacTypes.h>
 #include <Devices.h>
 #include <Endian.h>
@@ -836,6 +838,7 @@ int net_service_lookup(char *service)
     return 0;
 }
 
+#endif
 
 /*
  * Local Variables: