diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-03-17 20:01:50 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-03-17 20:01:50 +0100 |
| commit | f1d75e3bba2aa2de9caf6e01f40dc0c5f98d8012 (patch) | |
| tree | 6c38f5290f14b4f1478c71ddc9fdccc7f272e736 | |
| parent | 4931be268277559a328d40218e2ae929e11c21fa (diff) | |
| download | sciteco-f1d75e3bba2aa2de9caf6e01f40dc0c5f98d8012.tar.gz | |
added patch fixing Scinterm on certain 64-bit configurations
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | patches/scinterm-fix-64-bit.patch | 22 |
2 files changed, 24 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index e94317d..3fdeaae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,6 +6,7 @@ noinst_HEADERS = compat/bsd/sys/cdefs.h \ compat/bsd/sys/queue.h \ compat/bsd/sys/tree.h -EXTRA_DIST = patches/scintilla-teco-control-codes.patch +EXTRA_DIST = patches/scintilla-teco-control-codes.patch \ + patches/scinterm-fix-64-bit.patch EXTRA_DIST += TODO 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 <stdio.h> + #include <stdlib.h> + #include <string.h> ++#include <stdint.h> + + #include <string> + #include <vector> +@@ -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<attr_t>(font_.GetID()), ++ intptr_t id = reinterpret_cast<intptr_t>(font_.GetID()); ++ wattr_set(win, static_cast<attr_t>(id), + term_color_pair(fore, back), NULL); + if (rc.left < 0) s += static_cast<int>(-rc.left), rc.left = 0; + mvwaddnstr(win, rc.top, rc.left, s, Platform::Minimum(len, COLS - rc.left)); |