Merge pull request #1027 from jrjang/master

0xc0170 · 0xc0170 · commit 31d139e40073 · 2015-04-10T08:13:45.000+02:00
RTOS - fix compilation warning
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c b/libraries/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c
@@ -2066,7 +2066,7 @@ osStatus osMailPut (osMailQId queue_id, void *mail) {
   return osMessagePut(*((void **)queue_id), (uint32_t)mail, 0);
 }
 
-#ifdef __arm__
+#ifdef __CC_ARM
 #pragma push
 #pragma Ospace
 #endif // __arm__
@@ -2084,6 +2084,6 @@ os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) {
 
   return ret;
 }
-#ifdef __arm__
+#ifdef __CC_ARM
 #pragma pop
 #endif // __arm__
diff --git a/libraries/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c b/libraries/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c
@@ -1862,7 +1862,7 @@ osStatus osMailPut (osMailQId queue_id, void *mail) {
   return osMessagePut(*((void **)queue_id), (uint32_t)mail, 0);
 }
 
-#ifdef __arm__
+#ifdef __CC_ARM
 #pragma push
 #pragma Ospace
 #endif // __arm__
@@ -1880,6 +1880,6 @@ os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) {
 
   return ret;
 }
-#ifdef __arm__
+#ifdef __CC_ARM
 #pragma pop
 #endif // __arm__

Original file line number	Diff line number	Diff line change
`@@ -2066,7 +2066,7 @@ osStatus osMailPut (osMailQId queue_id, void *mail) {`
`2066`	`2066`	`return osMessagePut(((void *)queue_id), (uint32_t)mail, 0);`
`2067`	`2067`	`}`
`2068`	`2068`
`2069`		`-#ifdef __arm__`
	`2069`	`+#ifdef __CC_ARM`
`2070`	`2070`	`#pragma push`
`2071`	`2071`	`#pragma Ospace`
`2072`	`2072`	`#endif // __arm__`
`@@ -2084,6 +2084,6 @@ os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) {`
`2084`	`2084`
`2085`	`2085`	`return ret;`
`2086`	`2086`	`}`
`2087`		`-#ifdef __arm__`
	`2087`	`+#ifdef __CC_ARM`
`2088`	`2088`	`#pragma pop`
`2089`	`2089`	`#endif // __arm__`
Original file line number	Diff line number	Diff line change
`@@ -1862,7 +1862,7 @@ osStatus osMailPut (osMailQId queue_id, void *mail) {`
`1862`	`1862`	`return osMessagePut(((void *)queue_id), (uint32_t)mail, 0);`
`1863`	`1863`	`}`
`1864`	`1864`
`1865`		`-#ifdef __arm__`
	`1865`	`+#ifdef __CC_ARM`
`1866`	`1866`	`#pragma push`
`1867`	`1867`	`#pragma Ospace`
`1868`	`1868`	`#endif // __arm__`
`@@ -1880,6 +1880,6 @@ os_InRegs osEvent osMailGet (osMailQId queue_id, uint32_t millisec) {`
`1880`	`1880`
`1881`	`1881`	`return ret;`
`1882`	`1882`	`}`
`1883`		`-#ifdef __arm__`
	`1883`	`+#ifdef __CC_ARM`
`1884`	`1884`	`#pragma pop`
`1885`	`1885`	`#endif // __arm__`