diff options
author | coderkun <olli@coderkun.de> | 2016-10-02 10:04:29 +0200 |
---|---|---|
committer | coderkun <olli@coderkun.de> | 2016-10-02 10:04:29 +0200 |
commit | 8655677584483e46d9b45873aa50ec6e860486dd (patch) | |
tree | 3f1037d47607fd40be82fe9169795978f8f3551f /tmk_core/common/mbed | |
parent | a10e100bd5e8bad73e1b04f54639a4cec36e4b9e (diff) | |
parent | 35e6870e5c8943c044187256e01c96ef400ca067 (diff) |
Merge branch 'master' into coderkun_neo2
Diffstat (limited to 'tmk_core/common/mbed')
-rw-r--r-- | tmk_core/common/mbed/xprintf.cpp | 2 | ||||
-rw-r--r-- | tmk_core/common/mbed/xprintf.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/common/mbed/xprintf.cpp b/tmk_core/common/mbed/xprintf.cpp index 3647ece751..b1aac2c99d 100644 --- a/tmk_core/common/mbed/xprintf.cpp +++ b/tmk_core/common/mbed/xprintf.cpp @@ -7,7 +7,7 @@ #define STRING_STACK_LIMIT 120 //TODO -int xprintf(const char* format, ...) { return 0; } +int __xprintf(const char* format, ...) { return 0; } #if 0 /* mbed Serial */ diff --git a/tmk_core/common/mbed/xprintf.h b/tmk_core/common/mbed/xprintf.h index 26bc529e5b..1e7a48c06d 100644 --- a/tmk_core/common/mbed/xprintf.h +++ b/tmk_core/common/mbed/xprintf.h @@ -7,7 +7,7 @@ extern "C" { #endif -int xprintf(const char *format, ...); +int __xprintf(const char *format, ...); #ifdef __cplusplus } |