From f1d75e3bba2aa2de9caf6e01f40dc0c5f98d8012 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Sun, 17 Mar 2013 20:01:50 +0100 Subject: added patch fixing Scinterm on certain 64-bit configurations --- patches/scinterm-fix-64-bit.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 patches/scinterm-fix-64-bit.patch (limited to 'patches') diff --git a/patches/scinterm-fix-64-bit.patch b/patches/scinterm-fix-64-bit.patch new file mode 100644 index 0000000..2196b03 --- /dev/null +++ b/patches/scinterm-fix-64-bit.patch @@ -0,0 +1,22 @@ +Fixes (void *) to (attr_t) casting on certain target configurations +where sizeof(attr_t) < sizeof(void *) +--- scintilla/scinterm/ScintillaTerm.cxx 2013-03-17 19:22:04.864167902 +0100 ++++ scintilla/scinterm/ScintillaTerm.cxx 2013-03-17 19:44:48.832401507 +0100 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -274,7 +275,8 @@ + void DrawTextNoClip(PRectangle rc, Font &font_, XYPOSITION ybase, + const char *s, int len, ColourDesired fore, + ColourDesired back) { +- wattr_set(win, reinterpret_cast(font_.GetID()), ++ intptr_t id = reinterpret_cast(font_.GetID()); ++ wattr_set(win, static_cast(id), + term_color_pair(fore, back), NULL); + if (rc.left < 0) s += static_cast(-rc.left), rc.left = 0; + mvwaddnstr(win, rc.top, rc.left, s, Platform::Minimum(len, COLS - rc.left)); -- cgit v1.2.3