diff options
| author | Josh Colbeck <skrymir@gmail.com> | 2017-02-21 20:31:16 -0600 |
|---|---|---|
| committer | Josh Colbeck <skrymir@gmail.com> | 2017-02-21 20:31:16 -0600 |
| commit | e51001efcc3ff8b64f8264e8bd4c2dbea15f3364 (patch) | |
| tree | bdf5a0a4b44d5e63ba1376b70d94f64c77f3c90c /tmk_core/common/mbed | |
| parent | c56693f858cb3409e4a68a8e65a1370c022a51ed (diff) | |
| parent | 7ff41df32c29bca4e3a6efc3047b8fa93bb99b92 (diff) | |
Merge remote-tracking branch 'qmk/master'
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 } |