diff options
| -rw-r--r-- | doc/ScintillaHistory.html | 8 | ||||
| -rw-r--r-- | src/KeyMap.cxx | 2 | ||||
| -rw-r--r-- | src/RunStyles.cxx | 2 |
3 files changed, 11 insertions, 1 deletions
diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html index 4af05b217..515b72be2 100644 --- a/doc/ScintillaHistory.html +++ b/doc/ScintillaHistory.html @@ -585,6 +585,14 @@ <li> Fix re-entrant painting on GTK to maintain update region. </li> + <li> + Fix key map for GTK on macOS. + <a href="https://sourceforge.net/p/scintilla/bugs/2315/">Bug #2315</a>. + </li> + <li> + Fix building for Haiku. + <a href="https://sourceforge.net/p/scintilla/bugs/2315/">Bug #2315</a>. + </li> </ul> <h3> <a href="https://www.scintilla.org/scintilla520.zip">Release 5.2.0</a> diff --git a/src/KeyMap.cxx b/src/KeyMap.cxx index 8d6857546..da4f242a4 100644 --- a/src/KeyMap.cxx +++ b/src/KeyMap.cxx @@ -18,6 +18,8 @@ #include "ScintillaMessages.h" #include "Debugging.h" +#include "Geometry.h" +#include "Platform.h" #include "KeyMap.h" diff --git a/src/RunStyles.cxx b/src/RunStyles.cxx index e9d3f6e4e..ed4ecc216 100644 --- a/src/RunStyles.cxx +++ b/src/RunStyles.cxx @@ -309,7 +309,7 @@ void RunStyles<DISTANCE, STYLE>::Check() const { template class Scintilla::Internal::RunStyles<int, int>; template class Scintilla::Internal::RunStyles<int, char>; -#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU +#if (PTRDIFF_MAX != INT_MAX) || defined(__HAIKU__) template class Scintilla::Internal::RunStyles<ptrdiff_t, int>; template class Scintilla::Internal::RunStyles<ptrdiff_t, char>; #endif |