Miscellaneous fixes to try to make other compilers happier

[u/mdw/putty] / winstore.c

diff --git a/winstore.c b/winstore.c
index 3aef22f..51f4ee7 100644 (file)
--- a/winstore.c
+++ b/winstore.c
@@ -4,6 +4,13 @@
  */
 
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include "putty.h"
 #include "storage.h"
@@ -221,8 +228,6 @@ int verify_host_key(char *hostname, int port, char *keytype, char *key) {
      */
     otherstr = smalloc(len);
     regname = smalloc(3*(strlen(hostname)+strlen(keytype))+15);
-    if (!otherstr || !regname)
-       fatalbox("Out of memory");
 
     hostkey_regname(regname, hostname, port, keytype);
 
@@ -315,8 +320,6 @@ void store_host_key(char *hostname, int port, char *keytype, char *key) {
     HKEY rkey;
 
     regname = smalloc(3*(strlen(hostname)+strlen(keytype))+15);
-    if (!regname)
-       fatalbox("Out of memory");
 
     hostkey_regname(regname, hostname, port, keytype);