From aeb285c6677ebb1d940d2a4d8e6992697ed263c8 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sat, 5 Jun 2021 09:47:52 +1000
Subject: Bug [#2259]. Fix gcc link-time-optimization compilation.

---
 doc/ScintillaHistory.html | 4 ++++
 win32/HanjaDic.cxx        | 2 ++
 win32/PlatWin.cxx         | 1 +
 win32/ScintillaWin.cxx    | 1 +
 4 files changed, 8 insertions(+)

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>
-- 
cgit v1.2.3