From b82f4686810d84b27f4ef5bf040a7cf242bc9984 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 27 Mar 2019 07:41:01 +1100
Subject: Add <algorithm> for std::min/max. Standardize on _WIN32 to gate Win32
 features. Protect from windows.h definition of min/max.

---
 gtk/PlatGTK.cxx                | 1 +
 gtk/ScintillaGTK.cxx           | 4 +++-
 gtk/ScintillaGTKAccessible.cxx | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gtk/PlatGTK.cxx b/gtk/PlatGTK.cxx
index 8a33b81d4..0701eb7a1 100644
--- a/gtk/PlatGTK.cxx
+++ b/gtk/PlatGTK.cxx
@@ -13,6 +13,7 @@
 #include <string_view>
 #include <vector>
 #include <map>
+#include <algorithm>
 #include <memory>
 #include <sstream>
 
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx
index a37f66967..1c27f89e6 100644
--- a/gtk/ScintillaGTK.cxx
+++ b/gtk/ScintillaGTK.cxx
@@ -29,7 +29,9 @@
 #include <gdk/gdkwayland.h>
 #endif
 
-#if defined(__WIN32__) || defined(_MSC_VER)
+#if defined(_WIN32)
+// On Win32 use windows.h to access clipboard (rectangular format) and systems parameters
+#define NOMINMAX
 #include <windows.h>
 #endif
 
diff --git a/gtk/ScintillaGTKAccessible.cxx b/gtk/ScintillaGTKAccessible.cxx
index 44069e274..510db1945 100644
--- a/gtk/ScintillaGTKAccessible.cxx
+++ b/gtk/ScintillaGTKAccessible.cxx
@@ -78,7 +78,9 @@
 # include <gtk/gtk-a11y.h>
 #endif
 
-#if defined(__WIN32__) || defined(_MSC_VER)
+#if defined(_WIN32)
+// On Win32 use windows.h to access CLIPFORMAT
+#define NOMINMAX
 #include <windows.h>
 #endif
 
-- 
cgit v1.2.3