summaryrefslogtreecommitdiff
path: root/amiga
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2015-09-01 18:02:32 +0100
committerChris Young <chris@unsatisfactorysoftware.co.uk>2015-09-01 18:02:32 +0100
commita73d53845cc332de3ac09a2348a917b956e48f6a (patch)
treee760e5ba9ae7514e6d594176ed1f29b456674eb2 /amiga
parent33eb8d3324dee7dfaacd98d08aa559884531a24b (diff)
downloadnetsurf-a73d53845cc332de3ac09a2348a917b956e48f6a.tar.gz
netsurf-a73d53845cc332de3ac09a2348a917b956e48f6a.tar.bz2
Fix MinTerm defines for SDK 53.29
Diffstat (limited to 'amiga')
-rw-r--r--amiga/gui.c2
-rw-r--r--amiga/os3support.h3
-rw-r--r--amiga/plotters.c4
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,