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 /gtk/ScintillaGTK.cxx | |
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.
Diffstat (limited to 'gtk/ScintillaGTK.cxx')
-rw-r--r-- | gtk/ScintillaGTK.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
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 |