From f00008fa5a49722171c5b288f988a64443122115 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Fri, 20 Apr 2018 14:27:52 +1000
Subject: Stop "duplicate explicit instantiation" error on g++ 32-bit where int
 and ptrdiff_t are the same type.

---
 src/RunStyles.cxx | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

diff --git a/src/RunStyles.cxx b/src/RunStyles.cxx
index f92da5047..23392436b 100644
--- a/src/RunStyles.cxx
+++ b/src/RunStyles.cxx
@@ -6,9 +6,11 @@
 
 #include <cstddef>
 #include <cstdlib>
+#include <cstdint>
 #include <cstring>
 #include <cstdio>
 #include <cstdarg>
+#include <climits>
 
 #include <stdexcept>
 #include <vector>
@@ -306,5 +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
 template class Scintilla::RunStyles<ptrdiff_t, int>;
 template class Scintilla::RunStyles<ptrdiff_t, char>;
+#endif
-- 
cgit v1.2.3