diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-03-27 07:41:01 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-03-27 07:41:01 +1100 |
| commit | b82f4686810d84b27f4ef5bf040a7cf242bc9984 (patch) | |
| tree | 162a9dad0605f8a90b69c2a12a1d1d599b3f58d9 | |
| parent | a0841ccdf681a2b7fbcc45779191c844a1078507 (diff) | |
| download | scintilla-mirror-b82f4686810d84b27f4ef5bf040a7cf242bc9984.tar.gz | |
Add <algorithm> for std::min/max. Standardize on _WIN32 to gate Win32 features.
Protect from windows.h definition of min/max.
| -rw-r--r-- | gtk/PlatGTK.cxx | 1 | ||||
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 4 | ||||
| -rw-r--r-- | 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 |