aboutsummaryrefslogtreecommitdiffstats
path: root/src/gos/gos_chibios.h
diff options
context:
space:
mode:
authorThomas Sterren <thomas.sterren@simulton.com>2018-03-06 09:38:37 +0100
committerThomas Sterren <thomas.sterren@simulton.com>2018-03-06 09:38:37 +0100
commit65d00b16b9fbb46ecd69a383dc4adde5c5c03790 (patch)
tree30920f0457522be32ce2b332afe0d2916d93cf66 /src/gos/gos_chibios.h
parent992850bcb1992ff052d5ac2379e4675a34861723 (diff)
parentf265924396167729e8d9fb36a0383263f36c1270 (diff)
downloaduGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.tar.gz
uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.tar.bz2
uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.zip
Merge branch 'master' of https://git.ugfx.io/uGFX/uGFX
Diffstat (limited to 'src/gos/gos_chibios.h')
-rw-r--r--src/gos/gos_chibios.h17
1 files changed, 7 insertions, 10 deletions
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