Use memset() rather than OTMemzero(), and hence remove the need to weak link

against OTUtilityLib.

[originally from svn r2550]

diff --git a/mac/otnet.c b/mac/otnet.c
index fd87df4b6cdcbe472db3a71f383fea21db14f932..7a2cbd8af0741d92e96c6c7fa938f77da6f793e2 100644 (file)
--- a/mac/otnet.c
+++ b/mac/otnet.c
@@ -5,6 +5,8 @@
 #include <OpenTransport.h>
 #include <OpenTptInternet.h>
 
+#include <string.h>
+
 #define DEFINE_PLUG_METHOD_MACROS
 #include "putty.h"
 #include "network.h"
@@ -262,7 +264,7 @@ Socket ot_new(SockAddr addr, int port, int privport, int oobinline,
 
     /* FIXME: bolt the port onto the end */
 
-    OTMemzero(&connectCall, sizeof(TCall));
+    memset(&connectCall, 0, sizeof(TCall));
     connectCall.addr.buf = (UInt8 *) &(addr->address);
     connectCall.addr.len = sizeof(DNSAddress);
 

diff --git a/mkfiles.pl b/mkfiles.pl
index 206c39bd87825211eab77ca5419a5a56106d104f..9bd38680920d51a33fb68fe5f2dd30394c9b30fa 100755 (executable)
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -647,7 +647,6 @@ Libs_PPC =  {Libs_CFM} \xb6
                "{SharedLibraries}OpenTransportLib" \xb6
                        -weaklib OTClientLib \xb6
                        -weaklib OTClientUtilLib \xb6
-                       -weaklib OTUtilityLib \xb6
                "{SharedLibraries}OpenTptInternetLib" \xb6
                        -weaklib OTInetClientLib \xb6
                "{PPCLibraries}StdCRuntime.o" \xb6