X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/2e96d5041e9e7a241d14305ae3e89637476c4968..cbe2d68fd7c7c7bac692b3a2d200a5d2429ab201:/mac/otnet.c

diff --git a/mac/otnet.c b/mac/otnet.c
index eb24b85c..970a78e5 100644
--- a/mac/otnet.c
+++ b/mac/otnet.c
@@ -2,6 +2,11 @@
  * Macintosh OpenTransport networking abstraction
  */
 
+#if TARGET_API_MAC_CARBON
+#define OTCARBONAPPLICATION 1
+#endif
+
+#include <Files.h> /* Needed by OpenTransportInternet.h */
 #include <OpenTransport.h>
 #include <OpenTptInternet.h>
 
@@ -76,7 +81,7 @@ void ot_cleanup(void)
 
 SockAddr ot_namelookup(char const *host, char **canonicalname)
 {
-    SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
+    SockAddr ret = snew(struct SockAddr_tag);
     char *realhost;
 
     /* Casting away const -- hope OTInetStringToAddress is sensible */
@@ -88,14 +93,14 @@ SockAddr ot_namelookup(char const *host, char **canonicalname)
 	realhost = ret->hostinfo.name;
     else
 	realhost = "";
-    *canonicalname = smalloc(1+strlen(realhost));
+    *canonicalname = snewn(1+strlen(realhost), char);
     strcpy(*canonicalname, realhost);
     return ret;
 }
 
 SockAddr ot_nonamelookup(char const *host)
 {
-    SockAddr ret = smalloc(sizeof(struct SockAddr_tag));
+    SockAddr ret = snew(struct SockAddr_tag);
     
     ret->resolved = FALSE;
     ret->error = kOTNoError;
@@ -180,7 +185,7 @@ static int ot_tcp_write_oob(Socket s, char const *data, int len);
 static void ot_tcp_set_private_ptr(Socket s, void *ptr);
 static void *ot_tcp_get_private_ptr(Socket s);
 static void ot_tcp_set_frozen(Socket s, int is_frozen);
-static char *ot_tcp_socket_error(Socket s);
+static const char *ot_tcp_socket_error(Socket s);
 static void ot_recv(Actual_Socket s);
 void ot_poll(void);
 
@@ -200,7 +205,7 @@ Socket ot_register(void *sock, Plug plug)
     
     Actual_Socket ret;
 
-    ret = smalloc(sizeof(struct Socket_tag));
+    ret = snew(struct Socket_tag);
     ret->fn = &fn_table;
     ret->error = kOTNoError;
     ret->plug = plug;
@@ -249,7 +254,7 @@ Socket ot_new(SockAddr addr, int port, int privport, int oobinline,
     InetAddress dest;
     TCall connectCall;
 
-    ret = smalloc(sizeof(struct Socket_tag));
+    ret = snew(struct Socket_tag);
     ret->fn = &fn_table;
     ret->error = kOTNoError;
     ret->plug = plug;
@@ -415,7 +420,7 @@ char *ot_addr_error(SockAddr addr)
     sprintf(buf, "error %d", addr->error);
     return buf;
 }
-static char *ot_tcp_socket_error(Socket sock)
+static const char *ot_tcp_socket_error(Socket sock)
 {
     Actual_Socket s = (Actual_Socket) sock;
     static char buf[128];