2 files changed, 10 insertions, 1 deletions
diff --git a/os/rt/include/ch.h b/os/rt/include/ch.h
index 3e3b90983..c2c486c0f 100644
--- a/os/rt/include/ch.h
+++ b/os/rt/include/ch.h
@@ -104,6 +104,15 @@
 typedef struct thread thread_t;
 typedef struct virtual_timer virtual_timer_t;
 
+/* This function is special, it must be accessible from all modules.*/
+#ifdef __cplusplus
+extern "C" {
+#endif
+  void chSysHalt(const char *reason);
+#ifdef __cplusplus
+}
+#endif
+
 /* Inclusion of all the kernel sub-headers.*/
 #include "chconf.h"
 #include "chtypes.h"
diff --git a/os/rt/include/chdebug.h b/os/rt/include/chdebug.h
index c33d078d3..ee49eec00 100644
--- a/os/rt/include/chdebug.h
+++ b/os/rt/include/chdebug.h
@@ -196,7 +196,7 @@ typedef struct {
 #if !defined(chDbgAssert)
 #define chDbgAssert(c, r) {                                                 \
   if (!(c))                                                                 \
-  chSysHalt("A:"__QUOTE_THIS(__FUNCTION__)":"__QUOTE_THIS(__LINE__));       \
+    chSysHalt("A:"__QUOTE_THIS(__FUNCTION__)":"__QUOTE_THIS(__LINE__));     \
 }
 #endif /* !defined(chDbgAssert) */
 #else /* !CH_DBG_ENABLE_ASSERTS */