From 00c3ac5f5441fd25180b49672a2bb6a3e8ede121 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Tue, 31 Jul 2018 09:20:49 +1000
Subject: Backport: Define PLAT_HAIKU and use to avoid a reported compilation
 problem on 32-bit Haiku where ptrdiff_t and int are the same size but
 different types.

Backport of changeset 7070:406da729a8b3.
---
 include/Platform.h | 5 +++++
 src/RunStyles.cxx  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/include/Platform.h b/include/Platform.h
index 4299546ad..654460901 100644
--- a/include/Platform.h
+++ b/include/Platform.h
@@ -25,6 +25,7 @@
 #define PLAT_FOX 0
 #define PLAT_CURSES 0
 #define PLAT_TK 0
+#define PLAT_HAIKU 0
 
 #if defined(FOX)
 #undef PLAT_FOX
@@ -38,6 +39,10 @@
 #undef PLAT_CURSES
 #define PLAT_CURSES 1
 
+#elif defined(__HAIKU__)
+#undef PLAT_HAIKU
+#define PLAT_HAIKU 1
+
 #elif defined(SCINTILLA_QT)
 #undef PLAT_QT
 #define PLAT_QT 1
diff --git a/src/RunStyles.cxx b/src/RunStyles.cxx
index 7f385017a..ad3084a01 100644
--- a/src/RunStyles.cxx
+++ b/src/RunStyles.cxx
@@ -308,7 +308,7 @@ void RunStyles<DISTANCE, STYLE>::Check() const {
 
 template class Scintilla::RunStyles<int, int>;
 template class Scintilla::RunStyles<int, char>;
-#if PTRDIFF_MAX != INT_MAX
+#if (PTRDIFF_MAX != INT_MAX) || PLAT_HAIKU
 template class Scintilla::RunStyles<ptrdiff_t, int>;
 template class Scintilla::RunStyles<ptrdiff_t, char>;
 #endif
-- 
cgit v1.2.3