diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2014-02-16 13:35:40 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2014-02-16 13:35:40 +0100 |
| commit | ba22b1a307988fd493fc682daff20eee4c325451 (patch) | |
| tree | 7c2e482a07c8c8c0444ae8f0fa4757f3da50acfc /patches/020-scinterm-fix-64-bit.patch | |
| parent | 4ae59fd5cdcaba4d050e86d02c38dddacba2fc80 (diff) | |
| download | sciteco-ba22b1a307988fd493fc682daff20eee4c325451.tar.gz | |
updated minimum required Scintilla version to v3.3.7 / Scinterm v1.2
* allows us to remove most patches. One however is still necessary
(Scinterm Makefile bug!)
* TECO-style control code echoing is now set up using the SCI_SETREPRESENTATION message
* updated copyrights
* updated TODO
Diffstat (limited to 'patches/020-scinterm-fix-64-bit.patch')
| -rw-r--r-- | patches/020-scinterm-fix-64-bit.patch | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/patches/020-scinterm-fix-64-bit.patch b/patches/020-scinterm-fix-64-bit.patch deleted file mode 100644 index 47c7e6d..0000000 --- a/patches/020-scinterm-fix-64-bit.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fixes (void *) to (attr_t) casting on certain target configurations -where sizeof(attr_t) < sizeof(void *) ---- a/scintilla/scinterm/ScintillaTerm.cxx 2013-03-17 19:22:04.864167902 +0100 -+++ b/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)); |