diff options
| author | nyamatongwe <unknown> | 2012-07-17 12:49:28 +1000 |
|---|---|---|
| committer | nyamatongwe <unknown> | 2012-07-17 12:49:28 +1000 |
| commit | efedd005163aaa07073eac0f9fa7ac56f199ab39 (patch) | |
| tree | b76f100a1d1efe8e71cde67989aafebd8d48bfd5 /win32/ScintillaWin.cxx | |
| parent | 08c4dbe594ff23fcb0b35146973e3fe3df060ee3 (diff) | |
| download | scintilla-mirror-efedd005163aaa07073eac0f9fa7ac56f199ab39.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.cxx | 6 |
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> |