diff options
| author | Neil <nyamatongwe@gmail.com> | 2019-03-27 14:48:03 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2019-03-27 14:48:03 +1100 |
| commit | 374bd926bc43e260bc9b3debbd9ea42cd02f8848 (patch) | |
| tree | fcc4c1090075456df9bf449cb09adf7c887eb4f2 | |
| parent | 10d800584f5ae1f7e16937fb71042cf1117c3139 (diff) | |
| download | scintilla-mirror-374bd926bc43e260bc9b3debbd9ea42cd02f8848.tar.gz | |
Backport: Fix problem with MinGW which defines NOMINMAX itself.
Backport of changeset 7341:dcdb1db960e3.
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 1 | ||||
| -rw-r--r-- | gtk/ScintillaGTKAccessible.cxx | 1 |
2 files changed, 2 insertions, 0 deletions
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 |