diff options
| author | Neil <nyamatongwe@gmail.com> | 2021-06-05 09:47:52 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2021-06-05 09:47:52 +1000 |
| commit | aeb285c6677ebb1d940d2a4d8e6992697ed263c8 (patch) | |
| tree | f42b08ea30e439aa5ddb09f13ebf0eefad581105 | |
| parent | ce48887227040647c41adf1d28942f0b1e4c2a3f (diff) | |
| download | scintilla-mirror-aeb285c6677ebb1d940d2a4d8e6992697ed263c8.tar.gz | |
Bug [#2259]. Fix gcc link-time-optimization compilation.
| -rw-r--r-- | doc/ScintillaHistory.html | 4 | ||||
| -rw-r--r-- | win32/HanjaDic.cxx | 2 | ||||
| -rw-r--r-- | win32/PlatWin.cxx | 1 | ||||
| -rw-r--r-- | win32/ScintillaWin.cxx | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 411714498..19ba6ca78 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -584,6 +584,10 @@ Fixed bug with SCI_GETLASTCHILD. <a href="https://sourceforge.net/p/scintilla/bugs/2260/">Bug #2260</a>. </li> + <li> + Fixed gcc link-time-optimization (LTO) compilation. + <a href="https://sourceforge.net/p/scintilla/bugs/2259/">Bug #2259</a>. + </li> </ul> <h3> <a href="https://www.scintilla.org/scintilla503.zip">Release 5.0.3</a> diff --git a/win32/HanjaDic.cxx b/win32/HanjaDic.cxx index 828641400..cf598d64d 100644 --- a/win32/HanjaDic.cxx +++ b/win32/HanjaDic.cxx @@ -9,7 +9,9 @@ #include <string> #include <string_view> +#define WIN32_LEAN_AND_MEAN 1 #include <windows.h> +#include <ole2.h> #include "UniConversion.h" #include "HanjaDic.h" diff --git a/win32/PlatWin.cxx b/win32/PlatWin.cxx index f8bd7f163..ae0161f84 100644 --- a/win32/PlatWin.cxx +++ b/win32/PlatWin.cxx @@ -31,6 +31,7 @@ #define _WIN32_WINNT 0x0500 #undef WINVER #define WINVER 0x0500 +#define WIN32_LEAN_AND_MEAN 1 #include <windows.h> #include <commctrl.h> #include <richedit.h> diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx index 187feac9b..4c9109699 100644 --- a/win32/ScintillaWin.cxx +++ b/win32/ScintillaWin.cxx @@ -34,6 +34,7 @@ #define _WIN32_WINNT 0x0500 #undef WINVER #define WINVER 0x0500 +#define WIN32_LEAN_AND_MEAN 1 #include <windows.h> #include <commctrl.h> #include <richedit.h> |