未验证 提交 bdb15e0f 编写于 作者: B Bernard Xiong 提交者: GitHub

Merge pull request #1047 from TanekLiang/romfs_iar_compile_error

[dsf] fix romfs build error in IAR (__weak should in start for variab…
...@@ -39,13 +39,13 @@ const static unsigned char _dummy_txt[] = ...@@ -39,13 +39,13 @@ const static unsigned char _dummy_txt[] =
0x74,0x68,0x69,0x73,0x20,0x69,0x73,0x20,0x61,0x20,0x66,0x69,0x6c,0x65,0x21,0x0d,0x0a, 0x74,0x68,0x69,0x73,0x20,0x69,0x73,0x20,0x61,0x20,0x66,0x69,0x6c,0x65,0x21,0x0d,0x0a,
}; };
const struct romfs_dirent RT_WEAK _root_dirent[] = RT_WEAK const struct romfs_dirent _root_dirent[] =
{ {
{ROMFS_DIRENT_DIR, "dummy", (rt_uint8_t *)_dummy, sizeof(_dummy)/sizeof(_dummy[0])}, {ROMFS_DIRENT_DIR, "dummy", (rt_uint8_t *)_dummy, sizeof(_dummy)/sizeof(_dummy[0])},
{ROMFS_DIRENT_FILE, "dummy.txt", _dummy_txt, sizeof(_dummy_txt)}, {ROMFS_DIRENT_FILE, "dummy.txt", _dummy_txt, sizeof(_dummy_txt)},
}; };
const struct romfs_dirent RT_WEAK romfs_root = RT_WEAK const struct romfs_dirent romfs_root =
{ {
ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_root_dirent, sizeof(_root_dirent)/sizeof(_root_dirent[0]) ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_root_dirent, sizeof(_root_dirent)/sizeof(_root_dirent[0])
}; };
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册