diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-03-19 18:40:56 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2013-03-19 18:49:40 +0100 |
| commit | f53b3dad2fc76677319810944440f7058f375f63 (patch) | |
| tree | b23b0a1dca333c7feb31256ba6b446c5afbb5b94 /patches/020-scinterm-fix-64-bit.patch | |
| parent | d87857bdb0c1100b368d024df4d5b78deb0e8a7b (diff) | |
| download | sciteco-f53b3dad2fc76677319810944440f7058f375f63.tar.gz | |
added minor scinterm patches and cleaned up patch system
* MinGW binaries are built from source bundles
* patches are applied to the source bundle
* so all necessary patches must be in the repository and distributed
* use a leading number in patch names to ensure proper application order
Diffstat (limited to 'patches/020-scinterm-fix-64-bit.patch')
| -rw-r--r-- | patches/020-scinterm-fix-64-bit.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/patches/020-scinterm-fix-64-bit.patch b/patches/020-scinterm-fix-64-bit.patch new file mode 100644 index 0000000..47c7e6d --- /dev/null +++ b/patches/020-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 *) +--- 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)); |