Add a level of indirection to make it rather easier to work out which of a

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

diff --git a/mac/mtcpnet.c b/mac/mtcpnet.c
index 5c25665..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>
@@ -130,8 +132,9 @@ typedef CALLBACK_API_C(OSErr, AddrToStrProcPtr)(UInt32, unsigned long, char *);
 typedef STACK_UPP_TYPE(AddrToStrProcPtr) AddrToStrUPP;
 enum { uppAddrToStrProcInfo = kCStackBased
        | RESULT_SIZE(SIZE_CODE(sizeof(OSErr)))
-       | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(unsigned long)))
-       | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(char *)))
+       | STACK_ROUTINE_PARAMETER(1, SIZE_CODE(sizeof(UInt32)))
+       | STACK_ROUTINE_PARAMETER(2, SIZE_CODE(sizeof(unsigned long)))
+       | STACK_ROUTINE_PARAMETER(3, SIZE_CODE(sizeof(char *)))
 };
 #define InvokeAddrToStrUPP(selector, addr, addrStr, userUPP)           \
     CALL_THREE_PARAMETER_UPP((userUPP), uppAddrToStrProcInfo, (selector),\
@@ -835,6 +838,7 @@ int net_service_lookup(char *service)
     return 0;
 }
 
+#endif
 
 /*
  * Local Variables: