From b4813cbdd4fe867c276b363e597b32f6a82a58dd Mon Sep 17 00:00:00 2001
From: nyamatongwe <devnull@localhost>
Date: Tue, 17 Jul 2012 12:49:28 +1000
Subject: MultiMon.h can cause multiple definition problems when Scintilla is
 statically linked. Avoid these issues and ensure compatibility with NT 4 by
 not including MultiMon.h and dynamically linking to the monitor APIs when
 available. If not available use the single monitor work area to define the
 available area.

---
 win32/ScintillaWin.cxx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'win32/ScintillaWin.cxx')

diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index e92bd7b13..367e33466 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -18,11 +18,9 @@
 #include <map>
 
 #undef _WIN32_WINNT
-#ifdef WIN_TARGET
-#define _WIN32_WINNT WIN_TARGET
-#else
 #define _WIN32_WINNT 0x0500
-#endif
+#undef WINVER
+#define WINVER 0x0500
 #include <windows.h>
 #include <commctrl.h>
 #include <richedit.h>
-- 
cgit v1.2.3