From 527a13a841869c62cacd0cf5db2ba4d5402018c9 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sat, 15 Aug 2015 17:32:28 +0100
Subject: Ensure OS3 doesn't try to obtain an 8-bit GlyphMap.

---
 amiga/font.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/amiga/font.c b/amiga/font.c
index c39b00264..78faa9d2b 100644
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -595,17 +595,17 @@ static inline int32 ami_font_plot_glyph(struct OutlineFont *ofont, struct RastPo
 	}
 #endif
 
-	if(aa == true) {
 #ifdef __amigaos4__
+	if(__builtin_expect(aa == true, 1)) {
 		glyphmaptag = OT_GlyphMap8Bit;
 		template_type = BLITT_ALPHATEMPLATE;
-#endif
 	} else {
+#endif
 		glyphmaptag = OT_GlyphMap;
 #ifdef __amigaos4__
 		template_type = BLITT_TEMPLATE;
-#endif
 	}
+#endif
  
 	long_char_1 = amiga_nsfont_decode_surrogate(char1);
 	long_char_2 = amiga_nsfont_decode_surrogate(char2);
-- 
cgit v1.2.3