From a73d53845cc332de3ac09a2348a917b956e48f6a Mon Sep 17 00:00:00 2001 From: Chris Young Date: Tue, 1 Sep 2015 18:02:32 +0100 Subject: Fix MinTerm defines for SDK 53.29 --- amiga/gui.c | 2 +- amiga/os3support.h | 3 +++ amiga/plotters.c | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/amiga/gui.c b/amiga/gui.c index 07fded3ef..aa84b52a5 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -1689,7 +1689,7 @@ static void gui_window_set_icon(struct gui_window *g, hlcache_handle *icon) } else { tag = BLITA_MaskPlane; tag_data = (ULONG)ami_bitmap_get_mask(icon_bitmap, 16, 16, bm); - minterm = (ABC|ABNC|ANBC); + minterm = MINTERM_SRCMASK; } if(ami_gui_get_space_box((Object *)g->shared->objects[GID_ICON], &bbox) != NSERROR_OK) { diff --git a/amiga/os3support.h b/amiga/os3support.h index 128e6bfdf..ac7f31590 100644 --- a/amiga/os3support.h +++ b/amiga/os3support.h @@ -119,6 +119,9 @@ #define GetFontEnd End #define GetScreenModeEnd End +/* MinTerm stuff */ +#define MINTERM_SRCMASK (ABC|ABNC|ANBC) + /* Easy compat macros */ /* application */ #define Notify(...) (void)0 diff --git a/amiga/plotters.c b/amiga/plotters.c index e255b9e01..0af5dd59f 100644 --- a/amiga/plotters.c +++ b/amiga/plotters.c @@ -558,7 +558,7 @@ static bool ami_bitmap(int x, int y, int width, int height, struct bitmap *bitma } else { tag = BLITA_MaskPlane; if((tag_data = (ULONG)ami_bitmap_get_mask(bitmap, width, height, tbm))) - minterm = (ABC|ABNC|ANBC); + minterm = MINTERM_SRCMASK; } #ifdef __amigaos4__ BltBitMapTags(BLITA_Width,width, @@ -759,7 +759,7 @@ static void ami_bitmap_tile_hook(struct Hook *hook,struct RastPort *rp,struct Ba } else { tag = BLITA_MaskPlane; if((tag_data = (ULONG)bfbm->mask)) - minterm = (ABC|ABNC|ANBC); + minterm = MINTERM_SRCMASK; } BltBitMapTags(BLITA_Width, bfbm->width, -- cgit v1.2.3