From 53b29f40e7051a342c7db0b5fca5e70f1b036dac Mon Sep 17 00:00:00 2001 From: Joakim Gebart Date: Thu, 29 Jan 2015 10:14:59 +0100 Subject: [PATCH] cortex-m4: Add extern "C" to core_cmInstr.h Signed-off-by: Joakim Gebart --- cpu/cortex-m4_common/include/core_cmInstr.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/cpu/cortex-m4_common/include/core_cmInstr.h b/cpu/cortex-m4_common/include/core_cmInstr.h index d14110b2ab..d32c3588c9 100644 --- a/cpu/cortex-m4_common/include/core_cmInstr.h +++ b/cpu/cortex-m4_common/include/core_cmInstr.h @@ -38,6 +38,9 @@ #ifndef __CORE_CMINSTR_H #define __CORE_CMINSTR_H +#ifdef __cplusplus + extern "C" { +#endif /* ########################## Core Instruction Access ######################### */ /** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface @@ -523,7 +526,7 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE int32_t __REVSH(int32_t value */ __attribute__( ( always_inline ) ) __STATIC_INLINE uint32_t __ROR(uint32_t op1, uint32_t op2) { - return (op1 >> op2) | (op1 << (32 - op2)); + return (op1 >> op2) | (op1 << (32 - op2)); } @@ -877,4 +880,8 @@ __attribute__( ( always_inline ) ) __STATIC_INLINE void __STRT(uint32_t value, v /*@}*/ /* end of group CMSIS_Core_InstructionInterface */ +#ifdef __cplusplus +} +#endif + #endif /* __CORE_CMINSTR_H */