diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-07-31 09:20:49 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-07-31 09:20:49 +1000 |
| commit | d57e9ede52be29901e5328e1192ceed64bd94a4c (patch) | |
| tree | 25bdfd512e1bb4fa93e54a59a9470b18e008ab8c | |
| parent | 22b8ec313314be239a04741669fa3e7a19f8288e (diff) | |
| download | scintilla-mirror-d57e9ede52be29901e5328e1192ceed64bd94a4c.tar.gz | |
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.
| -rw-r--r-- | include/Platform.h | 5 | ||||
| -rw-r--r-- | src/RunStyles.cxx | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/Platform.h b/include/Platform.h index a70a00b78..c1924eda5 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 44d694265..100ca399d 100644 --- a/src/RunStyles.cxx +++ b/src/RunStyles.cxx @@ -309,7 +309,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 |