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 | 5e0e7e6e8a5c67e28bfbd950c33d26b03ed60439 (patch) | |
| tree | 2ce251ef8847e426dae6bfeabc69a8827af29504 | |
| parent | 8a293e05789bcae9fcd25cc0369a1f58c3b2038a (diff) | |
| download | scintilla-mirror-5e0e7e6e8a5c67e28bfbd950c33d26b03ed60439.tar.gz | |
Fix problem with MinGW which defines NOMINMAX itself.
| -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 d067843ea..228a369e9 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -31,6 +31,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 89e929b87..375a00039 100644 --- a/gtk/ScintillaGTKAccessible.cxx +++ b/gtk/ScintillaGTKAccessible.cxx @@ -80,6 +80,7 @@ #if defined(_WIN32) // On Win32 use windows.h to access CLIPFORMAT +#undef NOMINMAX #define NOMINMAX #include <windows.h> #endif |