Patch from RDB: invent a /DMSVC4 compile-time definition which

renames header files and symbols etc. Now if I could only _find_ my
copy of MSVC4 we might even be able to build Win32s binaries...

git-svn-id: svn://svn.tartarus.org/sgt/putty@1532 cda61777-01e9-0310-a592-d414129be87e

diff --git a/Makefile b/Makefile
index 1c9ca13..b69762a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,11 @@
 #      full-screen mode (configurable to work on Alt-Enter) will
 #      not behave usefully in a multi-monitor environment.
 #
+#  - COMPAT=/DMSVC4
+#  - RCFL=/DMSVC4
+#      Makes a couple of minor changes so that PuTTY compiles using
+#      MSVC 4. You will also need /DNO_SECURITY and /DNO_MULTIMON.
+#
 #  - RCFL=/DASCIICTLS
 #      Uses ASCII rather than Unicode to specify the tab control in
 #      the resource file. Probably most useful when compiling with

diff --git a/pageant.rc b/pageant.rc
index 21fa13d..299995a 100644 (file)
--- a/pageant.rc
+++ b/pageant.rc
@@ -1,6 +1,10 @@
 /* Some compilers, like Borland, don't have winresrc.h */
 #ifndef NO_WINRESRC_H
+#ifndef MSVC4
 #include <winresrc.h>
+#else
+#include <winres.h>
+#endif
 #endif
 
 /* Some systems don't define this, so I do it myself if necessary */

diff --git a/puttygen.rc b/puttygen.rc
index 5efb155..b7711c3 100644 (file)
--- a/puttygen.rc
+++ b/puttygen.rc
@@ -1,6 +1,10 @@
 /* Some compilers, like Borland, don't have winresrc.h */
 #ifndef NO_WINRESRC_H
+#ifndef MSVC4
 #include <winresrc.h>
+#else
+#include <winres.h>
+#endif
 #endif
 
 /* Some systems don't define this, so I do it myself if necessary */

diff --git a/win_res.rc b/win_res.rc
index e251961..d2d81d1 100644 (file)
--- a/win_res.rc
+++ b/win_res.rc
@@ -1,6 +1,10 @@
 /* Some compilers, like Borland, don't have winresrc.h */
 #ifndef NO_WINRESRC_H
+#ifndef MSVC4
 #include <winresrc.h>
+#else
+#include <winres.h>
+#endif
 #endif
 
 /* Some systems don't define this, so I do it myself if necessary */

diff --git a/windlg.c b/windlg.c
index 51a9756..202e6cf 100644 (file)
--- a/windlg.c
+++ b/windlg.c
@@ -12,6 +12,12 @@
 #include "win_res.h"
 #include "storage.h"
 
+#ifdef MSVC4
+#define TVINSERTSTRUCT  TV_INSERTSTRUCT
+#define TVITEM          TV_ITEM
+#define ICON_BIG        1
+#endif
+
 static char **events = NULL;
 static int nevents = 0, negsize = 0;