From ac99bf8caef4efbff29d031ab04f7e44ab5234d9 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Wed, 16 Feb 2022 09:39:20 +1100
Subject: Bug [#2315] Fix undefined macros. Fixes key map for GTK on macOS and
 Haiku build.

---
 src/KeyMap.cxx    | 2 ++
 src/RunStyles.cxx | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'src')

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
-- 
cgit v1.2.3