From f265924396167729e8d9fb36a0383263f36c1270 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Tue, 27 Feb 2018 17:44:21 +1000
Subject: First set of V3 macro changes

---
 src/gos/gos_chibios.h | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/gos/gos_chibios.h')

diff --git a/src/gos/gos_chibios.h b/src/gos/gos_chibios.h
index aedfb492..cb683631 100644
--- a/src/gos/gos_chibios.h
+++ b/src/gos/gos_chibios.h
@@ -10,10 +10,13 @@
 
 #if GFX_USE_OS_CHIBIOS
 
-// This shouldn't be needed but some people are complaining
-// about TRUE/FALSE redefinition so we fix it here.
-#undef TRUE
-#undef FALSE
+#if GFX_COMPAT_V2
+	// This shouldn't be needed but some people are complaining
+	// about TRUE/FALSE redefinition so we fix it here.
+	// ChibiOS will define them in its own header files.
+	#undef TRUE
+	#undef FALSE
+#endif
 
 #include "ch.h"
 #include "hal.h"
@@ -33,12 +36,6 @@
  * are already defined by ChibiOS
  */
 
-#if !defined(FALSE)
-	#define FALSE       0
-#endif
-#if !defined(TRUE)
-	#define TRUE        -1
-#endif
 #if (CH_KERNEL_MAJOR == 3) || (CH_KERNEL_MAJOR == 4)
 	typedef char	bool_t;
 #endif
-- 
cgit v1.2.3