libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1047 from TanekLiang/romfs_iar_compile_error 

[dsf] fix romfs build error in IAR (__weak should in start for variab…
This commit is contained in:
Bernard Xiong 2017-11-28 23:19:08 +08:00 committed by GitHub
parent 89fd2e9f87 c63ce381fe
commit bdb15e0f72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/dfs/filesystems/romfs/romfs.c
View File

@ -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,
};
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_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])
};