From e8b789bfb166ee3218e9dbb4c6ddf74bdba79510 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Sun, 8 Jul 2018 10:05:34 +1000
Subject: Fix some missing gBool conversions

---
 src/gdisp/mcufont/mf_config.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/gdisp/mcufont/mf_config.h')

diff --git a/src/gdisp/mcufont/mf_config.h b/src/gdisp/mcufont/mf_config.h
index 3b76ee44..9a951054 100644
--- a/src/gdisp/mcufont/mf_config.h
+++ b/src/gdisp/mcufont/mf_config.h
@@ -16,6 +16,10 @@
 
 #include "../../../gfx.h"
 
+/* Ensure definitions are compatible with uGFX */
+#undef bool
+#define bool gBool
+
 #if !GFX_USE_GDISP || !GDISP_NEED_TEXT
 	#define MF_NO_COMPILE				// Don't compile any font code
 #endif
@@ -59,7 +63,7 @@
 /* Encoding for the input data.
  * With the unicode encodings, the library supports the range of unicode
  * characters 0x0000-0xFFFF (the Basic Multilingual Plane).
- * 
+ *
  * ASCII: Plain ascii (somewhat works with ISO8859-1 also)
  * UTF8:  UTF8 encoding (variable number of bytes)
  * UTF16: UTF16 encoding (2 bytes per character, compatible with UCS-2)
-- 
cgit v1.2.3