From 06c3eadd0e2c2fa768242ef84d3e088255363b83 Mon Sep 17 00:00:00 2001
From: simon <simon@cda61777-01e9-0310-a592-d414129be87e>
Date: Tue, 16 Jan 2007 21:32:02 +0000
Subject: [PATCH] Update WINVER to 0x500 to avoid build failures from Jacob's
 FlashWindow changes. Also fiddle with the <multimon.h> include, which was
 subtly broken in turn by that.

git-svn-id: svn://svn.tartarus.org/sgt/putty@7120 cda61777-01e9-0310-a592-d414129be87e
---
 mkfiles.pl       | 4 ++--
 windows/window.c | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mkfiles.pl b/mkfiles.pl
index e2bc3bbf..ca51b765 100755
--- a/mkfiles.pl
+++ b/mkfiles.pl
@@ -473,7 +473,7 @@ if (defined $makefiles{'borland'}) {
     "MAKEFILE = Makefile.bor\n".
     "\n".
     "# C compilation flags\n".
-    "CFLAGS = -D_WINDOWS -DWINVER=0x0401\n".
+    "CFLAGS = -D_WINDOWS -DWINVER=0x0500\n".
     "# Resource compilation flags\n".
     "RCFLAGS = -DNO_WINRESRC_H -DWIN32 -D_WIN32 -DWINVER=0x0401\n".
     "\n".
@@ -576,7 +576,7 @@ if (defined $makefiles{'vc'}) {
       "# C compilation flags\n".
       "CFLAGS = /nologo /W3 /O1 " .
       (join " ", map {"-I$dirpfx$_"} @srcdirs) .
-      " /D_WINDOWS /D_WIN32_WINDOWS=0x401 /DWINVER=0x401\n".
+      " /D_WINDOWS /D_WIN32_WINDOWS=0x500 /DWINVER=0x500\n".
       "LFLAGS = /incremental:no /fixed\n".
       "RCFLAGS = -DWIN32 -D_WIN32 -DWINVER=0x0400\n".
       "\n".
diff --git a/windows/window.c b/windows/window.c
index f49e3da6..824827a7 100644
--- a/windows/window.c
+++ b/windows/window.c
@@ -10,6 +10,10 @@
 #include <limits.h>
 #include <assert.h>
 
+#ifndef NO_MULTIMON
+#define COMPILE_MULTIMON_STUBS
+#endif
+
 #define PUTTY_DO_GLOBALS	       /* actually _define_ globals */
 #include "putty.h"
 #include "terminal.h"
@@ -17,11 +21,8 @@
 #include "win_res.h"
 
 #ifndef NO_MULTIMON
-#if WINVER < 0x0500
-#define COMPILE_MULTIMON_STUBS
 #include <multimon.h>
 #endif
-#endif
 
 #include <imm.h>
 #include <commctrl.h>
-- 
2.11.0