From f53b3dad2fc76677319810944440f7058f375f63 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Tue, 19 Mar 2013 18:40:56 +0100 Subject: 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 --- patches/scinterm-fix-64-bit.patch | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 patches/scinterm-fix-64-bit.patch (limited to 'patches/scinterm-fix-64-bit.patch') diff --git a/patches/scinterm-fix-64-bit.patch b/patches/scinterm-fix-64-bit.patch deleted file mode 100644 index 2196b03..0000000 --- a/patches/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 *) ---- 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