ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[RTOS] Fixed online compiler macro warnings 

Added an #ifndef directive to the __MBED_CMSIS_RTOS_CM and __CMSIS_RTOS macro definitions in order to prevent "Incompatible redefinition of macro" warnings from the online compiler.
pull/1803/head
Neil Thiessen 2016-05-27 10:10:52 -06:00
parent cd9f9331dc
commit 0fd3721d2e
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtos/rtx/TARGET_CORTEX_M/cmsis_os.h
View File

@ -57,9 +57,13 @@
#define CMSIS_OS_RTX #define CMSIS_OS_RTX
// __MBED_CMSIS_RTOS_CM captures our changes to the RTX kernel // __MBED_CMSIS_RTOS_CM captures our changes to the RTX kernel
#ifndef __MBED_CMSIS_RTOS_CM
#define __MBED_CMSIS_RTOS_CM #define __MBED_CMSIS_RTOS_CM
#endif
// we use __CMSIS_RTOS version, which changes some API in the kernel // we use __CMSIS_RTOS version, which changes some API in the kernel
#ifndef __CMSIS_RTOS
#define __CMSIS_RTOS #define __CMSIS_RTOS
#endif
// The stack space occupied is mainly dependent on the underling C standard library // The stack space occupied is mainly dependent on the underling C standard library
#if defined(TOOLCHAIN_GCC) || defined(TOOLCHAIN_ARM_STD) || defined(TOOLCHAIN_IAR) #if defined(TOOLCHAIN_GCC) || defined(TOOLCHAIN_ARM_STD) || defined(TOOLCHAIN_IAR)