Pedantry patch from RDB: sanitise header use, correct one comment

and remove an unused variable.

[originally from svn r1243]

diff --git a/mscrypto.c b/mscrypto.c
index 9d110ac335961877ac0fc0206f28779b85cc391e..c4f3380fa8129242f90df7ea1c22b3ed4b2032a9 100644 (file)
--- a/mscrypto.c
+++ b/mscrypto.c
@@ -1,3 +1,4 @@
+#error "This file is no longer part of PuTTY, it will not compile."
 #define _WIN32_WINNT 0x0400
 #include <windows.h>
 #include <stdio.h>

diff --git a/scp.c b/scp.c
index faf60ea4573693d94e883849daabd9dcffa0886b..5537ef33879a751578b2caf8bb478ebd2d22fe75 100644 (file)
--- a/scp.c
+++ b/scp.c
@@ -22,9 +22,6 @@
 #include <limits.h>
 #include <time.h>
 #include <assert.h>
-/* GUI Adaptation - Sept 2000 */
-#include <winuser.h>
-#include <winbase.h>
 
 #define PUTTY_DO_GLOBALS
 #include "putty.h"

diff --git a/sizetip.c b/sizetip.c
index c88321136648bdb1445c7dcfd2e40e50d90b49f1..ab709b5ba9248d0015031a1a439d78285680b9a1 100644 (file)
--- a/sizetip.c
+++ b/sizetip.c
@@ -1,8 +1,7 @@
 #include <windows.h>
-#include <winreg.h>
-#include <tchar.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <tchar.h>
 
 #include "putty.h"
 #include "winstuff.h"

diff --git a/sshzlib.c b/sshzlib.c
index cf471dbd88bb858cfc8ba0654790880d9e4a96e7..dc23f5ccb36f5f47c691e090c9550c04fca0eb9d 100644 (file)
--- a/sshzlib.c
+++ b/sshzlib.c
@@ -40,13 +40,13 @@
 #include <stdlib.h>
 #include <assert.h>
 
-/* FIXME */
-#include <windows.h>
-#include <stdio.h>
-#include "putty.h"
-
 #include "ssh.h"
 
+#ifndef FALSE
+#define FALSE 0
+#define TRUE (!FALSE)
+#endif
+
 /* ----------------------------------------------------------------------
  * Basic LZ77 code. This bit is designed modularly, so it could be
  * ripped out and used in a different LZ77 compressor. Go to it,

diff --git a/unicode.c b/unicode.c
index ad14b32598a1c2eaaba727aa569c86b08f77ca87..c3e1051994a79645a4b8f463d3dfcc4c087ace1b 100644 (file)
--- a/unicode.c
+++ b/unicode.c
@@ -16,7 +16,7 @@ static void get_unitab(int codepage, wchar_t * unitab, int ftype);
 
 /* Character conversion arrays; they are usually taken from windows,
  * the xterm one has the four scanlines that have no unicode 2.0
- * equlivents mapped into the private area.
+ * equivalents mapped to their unicode 3.0 locations.
  */
 static char **uni_tbl;
 
@@ -267,7 +267,7 @@ void init_ucs_tables(void)
     int i, j;
     int used_dtf = 0;
     char tbuf[256];
-    int old_codepage = line_codepage;
+
     for (i = 0; i < 256; i++)
        tbuf[i] = i;