summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/mbed
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-09-08 17:48:54 -0400
committerGitHub <noreply@github.com>2016-09-08 17:48:54 -0400
commit4a54ece4684478e29187d3b40ee07d6fa2c767f4 (patch)
tree6a0ab69e67fe3e8027ecc9b1bb1985965a50cb5b /tmk_core/common/mbed
parent0f111182a6bf217a37513d5c39fdb3d2a715996e (diff)
parentfe2aed0d1c8d1535c160755b76186972071aed02 (diff)
Merge pull request #730 from IBNobody/master
Change NKRO Report Size = 32, User Print
Diffstat (limited to 'tmk_core/common/mbed')
-rw-r--r--tmk_core/common/mbed/xprintf.cpp2
-rw-r--r--tmk_core/common/mbed/xprintf.h2
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
}
[cgit] Unable to lock slot /tmp/cgit/34200000.lock: Permission denied (13)