diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2016-09-19 13:25:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-19 13:25:37 +0200 |
| commit | c438a2a265b366c8e4594ce561feb896018983f0 (patch) | |
| tree | f310e72223a25414f69c2dec70509fed26dc3960 /tmk_core/common/mbed | |
| parent | af24ea558a65fea549bd9f57a9704b904972d2f7 (diff) | |
| parent | 5f9c2f63ffb2c58db73e67442134be58bfe2c129 (diff) | |
Merge pull request #4 from jackhumbert/master
Merge from jackhumbert
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 } |