diff options
| author | Jason Janse van Rensburg <[email protected]> | 2016-08-30 14:54:00 +0200 | 
|---|---|---|
| committer | Jason Janse van Rensburg <[email protected]> | 2016-08-30 14:54:00 +0200 | 
| commit | fc2ca62a3b9552175eb7c27cc11f3a5af6cfae50 (patch) | |
| tree | 59b2f2406f472a9fd2af4946420d1a1c880929c0 /tmk_core/common/print.h | |
| parent | a41a7a9100b9f4c6bfdf49b39b05e626ffd95397 (diff) | |
| parent | 8e00c464e6f488d86e0768a77a2ad5ee238dba6d (diff) | |
| download | qmk_firmware-fc2ca62a3b9552175eb7c27cc11f3a5af6cfae50.tar.gz qmk_firmware-fc2ca62a3b9552175eb7c27cc11f3a5af6cfae50.zip | |
Merge branch 'master'
Conflicts:
	keyboards/planck/keymaps/bone2planck/keymap.c
Diffstat (limited to 'tmk_core/common/print.h')
| -rw-r--r-- | tmk_core/common/print.h | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/tmk_core/common/print.h b/tmk_core/common/print.h index 0368bcd4a1..a1352527fc 100644 --- a/tmk_core/common/print.h +++ b/tmk_core/common/print.h @@ -29,7 +29,9 @@  #include <stdbool.h>  #include "util.h" - +#if defined(PROTOCOL_CHIBIOS) +#define PSTR(x) x +#endif  #ifndef NO_PRINT | 
