diff options
author | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
---|---|---|
committer | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
commit | e7f4d56592b3975c38af329e77b4efd9108495e8 (patch) | |
tree | 0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /tmk_core/common/util.h | |
parent | 71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff) | |
parent | 8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common/util.h')
-rw-r--r-- | tmk_core/common/util.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tmk_core/common/util.h b/tmk_core/common/util.h index 7451cc084d..68642e7fd3 100644 --- a/tmk_core/common/util.h +++ b/tmk_core/common/util.h @@ -22,11 +22,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. // convert to L string #define LSTR(s) XLSTR(s) -#define XLSTR(s) L ## #s +#define XLSTR(s) L## #s // convert to string #define STR(s) XSTR(s) #define XSTR(s) #s +#ifdef __cplusplus +extern "C" { +#endif uint8_t bitpop(uint8_t bits); uint8_t bitpop16(uint16_t bits); @@ -40,4 +43,8 @@ uint8_t bitrev(uint8_t bits); uint16_t bitrev16(uint16_t bits); uint32_t bitrev32(uint32_t bits); +#ifdef __cplusplus +} +#endif + #endif |