From b624f32f944acdc59dcb130674c09090c5c404cb Mon Sep 17 00:00:00 2001 From: skullY Date: Fri, 30 Aug 2019 11:19:03 -0700 Subject: clang-format changes --- tmk_core/common/util.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tmk_core/common/util.h') diff --git a/tmk_core/common/util.h b/tmk_core/common/util.h index 7451cc084d..5706b047d0 100644 --- a/tmk_core/common/util.h +++ b/tmk_core/common/util.h @@ -22,12 +22,11 @@ along with this program. If not, see . // 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 - uint8_t bitpop(uint8_t bits); uint8_t bitpop16(uint16_t bits); uint8_t bitpop32(uint32_t bits); -- cgit v1.2.3 From 41b9be560d68a69a0c87d90e94700082e1cbbd3a Mon Sep 17 00:00:00 2001 From: fauxpark Date: Fri, 4 Oct 2019 09:24:47 +1000 Subject: Wrap util.h functions in `extern "C"` (#6762) --- tmk_core/common/util.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'tmk_core/common/util.h') diff --git a/tmk_core/common/util.h b/tmk_core/common/util.h index 5706b047d0..68642e7fd3 100644 --- a/tmk_core/common/util.h +++ b/tmk_core/common/util.h @@ -27,6 +27,10 @@ along with this program. If not, see . #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); uint8_t bitpop32(uint32_t bits); @@ -39,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 -- cgit v1.2.3