Merge pull request #1027 from jrjang/master

RTOS - fix compilation warning
pull/1030/head
Martin Kojtal 2015-04-10 08:13:45 +02:00
commit 31d139e400
2 changed files with 4 additions and 4 deletions

View File

@ -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__

View File

@ -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__