aboutsummaryrefslogtreecommitdiffhomepage
path: root/win32/ScintillaWin.cxx
diff options
context:
space:
mode:
authornyamatongwe <devnull@localhost>2012-07-17 12:49:28 +1000
committernyamatongwe <devnull@localhost>2012-07-17 12:49:28 +1000
commitb4813cbdd4fe867c276b363e597b32f6a82a58dd (patch)
treeea60b9bdf12f85881b53d326c1054367e6e44b98 /win32/ScintillaWin.cxx
parent53e387e1732fd009c9d952a6423493a69befef7f (diff)
downloadscintilla-mirror-b4813cbdd4fe867c276b363e597b32f6a82a58dd.tar.gz
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.
Diffstat (limited to 'win32/ScintillaWin.cxx')
-rw-r--r--win32/ScintillaWin.cxx6
1 files changed, 2 insertions, 4 deletions
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>