From 374bd926bc43e260bc9b3debbd9ea42cd02f8848 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 27 Mar 2019 14:48:03 +1100
Subject: Backport: Fix problem with MinGW which defines NOMINMAX itself.

Backport of changeset 7341:dcdb1db960e3.
---
 gtk/ScintillaGTK.cxx           | 1 +
 gtk/ScintillaGTKAccessible.cxx | 1 +
 2 files changed, 2 insertions(+)

(limited to 'gtk')

diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index 18e781ecc..d256d631b 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -30,6 +30,7 @@
 
 #if defined(_WIN32)
 // On Win32 use windows.h to access clipboard (rectangular format) and systems parameters
+#undef NOMINMAX
 #define NOMINMAX
 #include <windows.h>
 #endif
diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx
index e2f051886..6e730c7da 100644
--- a/gtk/ScintillaGTKAccessible.cxx
+++ b/gtk/ScintillaGTKAccessible.cxx
@@ -79,6 +79,7 @@
 
 #if defined(_WIN32)
 // On Win32 use windows.h to access CLIPFORMAT
+#undef NOMINMAX
 #define NOMINMAX
 #include <windows.h>
 #endif
-- 
cgit v1.2.3