Fix miscellaneous compiler warnings. Thanks to Jacob Nevins

[originally from svn r755]

diff --git a/network.h b/network.h
index 71fe333bd677a80f50dcadb3c65fbd95e75658b4..dda34bc058e74f8673ea1ae10359f857b6f051a8 100644 (file)
--- a/network.h
+++ b/network.h
@@ -14,6 +14,9 @@
  * send _that_ to the receiver function with `urgent' set.
  */
 
+#ifndef PUTTY_NETWORK_H
+#define PUTTY_NETWORK_H
+
 typedef struct Socket_tag *Socket;
 typedef struct SockAddr_tag *SockAddr;
 typedef int (*sk_receiver_t)(Socket s, int urgent, char *data, int len);
@@ -42,3 +45,5 @@ void *sk_get_private_ptr(Socket s);
  */
 char *sk_addr_error(SockAddr addr);
 char *sk_socket_error(Socket addr);
+
+#endif

diff --git a/pageant.c b/pageant.c
index 8806f13b5fa080191d4a5437abcf25015c947f0b..53222fab7de0b3f90e4a5488898c95e783a50f8a 100644 (file)
--- a/pageant.c
+++ b/pageant.c
@@ -7,6 +7,8 @@
 #include <aclapi.h>
 #endif
 #include <stdio.h>
+#include <stdlib.h>
+#include <ctype.h>
 #include "ssh.h"
 #include "tree234.h"
 

diff --git a/plink.c b/plink.c
index ace6c75c9463d60a3812911caa6799ef94d599b3..16a44b38a1635b6f6cf0a15b829eb34b7a3436c8 100644 (file)
--- a/plink.c
+++ b/plink.c
@@ -7,6 +7,7 @@
 #endif
 #include <windows.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <stdarg.h>
 
 #define PUTTY_DO_GLOBALS                      /* actually _define_ globals */
@@ -16,7 +17,7 @@
 
 void fatalbox (char *p, ...) {
     va_list ap;
-    fprintf(stderr, "FATAL ERROR: ", p);
+    fprintf(stderr, "FATAL ERROR: ");
     va_start(ap, p);
     vfprintf(stderr, p, ap);
     va_end(ap);
@@ -26,7 +27,7 @@ void fatalbox (char *p, ...) {
 }
 void connection_fatal (char *p, ...) {
     va_list ap;
-    fprintf(stderr, "FATAL ERROR: ", p);
+    fprintf(stderr, "FATAL ERROR: ");
     va_start(ap, p);
     vfprintf(stderr, p, ap);
     va_end(ap);

diff --git a/puttygen.c b/puttygen.c
index 78e6465e66ad4cac7250815637d75ff6c1e06c71..8577c6b53c1caf5dedc7965e321f6e6ebb61c97b 100644 (file)
--- a/puttygen.c
+++ b/puttygen.c
@@ -6,6 +6,7 @@
 #include <commctrl.h>
 #include <time.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #define PUTTY_DO_GLOBALS
 

diff --git a/settings.c b/settings.c
index e762abaf1e03ed3b66fc7241cd145664f73d95ac..fdea968cde4247a8083f0ed0117cd092d6c0e1ac 100644 (file)
--- a/settings.c
+++ b/settings.c
@@ -4,6 +4,7 @@
 
 #include <windows.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "putty.h"
 #include "storage.h"
 

diff --git a/sshpubk.c b/sshpubk.c
index fddcf95e2d5f6a068f0a68d5095c4e1c9cf8e623..c9db8a1b6243d22921f9e240b09acbdefd69df9b 100644 (file)
--- a/sshpubk.c
+++ b/sshpubk.c
@@ -189,7 +189,7 @@ int saversakey(char *filename, struct RSAKey *key, struct RSAAux *aux,
     unsigned char buf[16384];
     unsigned char keybuf[16];
     struct MD5Context md5c;
-    char *p, *estart;
+    unsigned char *p, *estart;
     FILE *fp;
 
     /*

diff --git a/terminal.c b/terminal.c
index 12ad1e9c19096d1d7cd9e48539145885731d0021..f5ffa262973925820e53535cf559d59b79a0ab68 100644 (file)
--- a/terminal.c
+++ b/terminal.c
@@ -2,6 +2,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <ctype.h>
 
 #include "putty.h"
 

diff --git a/window.c b/window.c
index 680f065afd5fbf0b40e079df4be77c3b2c270f6c..3cab819770fc4e3f2ddcc13ee576336965b436f8 100644 (file)
--- a/window.c
+++ b/window.c
@@ -1,4 +1,5 @@
 #include <windows.h>
+#include <imm.h>
 #include <commctrl.h>
 #ifndef AUTO_WINSOCK
 #ifdef WINSOCK_TWO

diff --git a/winnet.c b/winnet.c
index 693228363fa1389010703501a5b71e37a92f5217..f80d8806fe9c78b1800a282fc34f048db91740ee 100644 (file)
--- a/winnet.c
+++ b/winnet.c
@@ -5,6 +5,7 @@
 #include <windows.h>
 #include <winsock.h>
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "putty.h"
 #include "network.h"
@@ -336,7 +337,7 @@ int select_result(WPARAM wParam, LPARAM lParam) {
     DWORD err;
     char buf[BUFFER_GRANULE];
     Socket s;
-    int atmark;
+    u_long atmark;
 
     /* wParam is the socket itself */
     s = find234(sktree, (void *)wParam, cmpforsearch);

diff --git a/winstore.c b/winstore.c
index 5597764897d9abf1cf9682eb6c912269290652ab..cd5fc34349976e8998d8c4270da016e01ff3f700 100644 (file)
--- a/winstore.c
+++ b/winstore.c
@@ -5,6 +5,7 @@
 
 #include <windows.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "putty.h"
 #include "storage.h"