summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbernard.xiong <[email protected]>2010-06-29 09:08:24 +0000
committerbernard.xiong <[email protected]>2010-06-29 09:08:24 +0000
commit4902e69f1e279ea38d6ca474af4abcc81440b8b3 (patch)
tree2c2a19767a0862fa010a02373d3f6dc5e62f0211
parent5900cc0c7389f9e1ea73bcf0691b0602ab4701cf (diff)
change the ALIGN definition for IAR compiler.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@781 bbd45198-f89e-11dd-88c7-29a3b14d5316
-rw-r--r--src/idle.c1
-rw-r--r--src/kservice.c4
2 files changed, 2 insertions, 3 deletions
diff --git a/src/idle.c b/src/idle.c
index 453f6bc409..f750a81601 100644
--- a/src/idle.c
+++ b/src/idle.c
@@ -23,6 +23,7 @@
#endif
static struct rt_thread idle;
+ALIGN(RT_ALIGN_SIZE)
static rt_uint8_t rt_thread_stack[IDLE_THREAD_STACK_SIZE];
#ifdef RT_USING_HEAP
diff --git a/src/kservice.c b/src/kservice.c
index 6f268609c6..e5ed2d39a0 100644
--- a/src/kservice.c
+++ b/src/kservice.c
@@ -926,9 +926,7 @@ void rt_hw_console_output(const char* str) __attribute__((weak));
void rt_hw_console_output(const char* str)
#elif defined(__CC_ARM)
__weak void rt_hw_console_output(const char* str)
-#elif defined(__ICCARM__)
-__weak void rt_hw_console_output(const char* str)
-#elif defined(__ICCM16C__)
+#elif defined(__IAR_SYSTEMS_ICC__)
void rt_hw_console_output(const char* str)
#endif
{