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 #849 from geniusgogo/RT_MACRO 

rename WEAK to RT_WEAK
This commit is contained in:
Bernard Xiong 2017-09-19 07:07:44 +08:00 committed by GitHub
parent ed46356eb4 85cc2dab69
commit a5eea11b02
6 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/cplusplus/crt_init.c
View File

@ -44,11 +44,11 @@ void _fini()
{
}
WEAK void *__dso_handle = 0;
RT_WEAK void *__dso_handle = 0;
#endif
WEAK
RT_WEAK
int cplusplus_system_init(void)
{
#if defined(__GNUC__) && !defined(__CC_ARM)

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 WEAK _root_dirent[] =
const struct romfs_dirent RT_WEAK _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 WEAK romfs_root =
const struct romfs_dirent RT_WEAK romfs_root =
{
ROMFS_DIRENT_DIR, "/", (rt_uint8_t *)_root_dirent, sizeof(_root_dirent)/sizeof(_root_dirent[0])
};

2
components/net/lwip-2.0.0/src/arch/sys_arch.c
View File

@ -600,7 +600,7 @@ u32_t sys_now(void)
return rt_tick_get() * (1000 / RT_TICK_PER_SECOND);
}
WEAK
RT_WEAK
void mem_init(void)
{
}

2
components/net/lwip-2.0.2/src/arch/sys_arch.c
View File

@ -602,7 +602,7 @@ u32_t sys_now(void)
}
WEAK
RT_WEAK
void mem_init(void)
{
}

12
include/rtdef.h
View File

@ -97,7 +97,7 @@ typedef rt_base_t rt_off_t; /**< Type for offset */
#define RT_UNUSED __attribute__((unused))
#define RT_USED __attribute__((used))
#define ALIGN(n) __attribute__((aligned(n)))
#define WEAK __weak
#define RT_WEAK __weak
#define rt_inline static __inline
/* module compiling */
#ifdef RT_USING_MODULE
@ -113,7 +113,7 @@ typedef rt_base_t rt_off_t; /**< Type for offset */
#define RT_USED __root
#define PRAGMA(x) _Pragma(#x)
#define ALIGN(n) PRAGMA(data_alignment=n)
#define WEAK __weak
#define RT_WEAK __weak
#define rt_inline static inline
#define RTT_API
@ -133,7 +133,7 @@ typedef rt_base_t rt_off_t; /**< Type for offset */
#define RT_UNUSED __attribute__((unused))
#define RT_USED __attribute__((used))
#define ALIGN(n) __attribute__((aligned(n)))
#define WEAK __attribute__((weak))
#define RT_WEAK __attribute__((weak))
#define rt_inline static __inline
#define RTT_API
#elif defined (__ADSPBLACKFIN__) /* for VisualDSP++ Compiler */
@ -142,7 +142,7 @@ typedef rt_base_t rt_off_t; /**< Type for offset */
#define RT_UNUSED __attribute__((unused))
#define RT_USED __attribute__((used))
#define ALIGN(n) __attribute__((aligned(n)))
#define WEAK __attribute__((weak))
#define RT_WEAK __attribute__((weak))
#define rt_inline static inline
#define RTT_API
#elif defined (_MSC_VER)
@ -151,7 +151,7 @@ typedef rt_base_t rt_off_t; /**< Type for offset */
#define RT_UNUSED
#define RT_USED
#define ALIGN(n) __declspec(align(n))
#define WEAK
#define RT_WEAK
#define rt_inline static __inline
#define RTT_API
#elif defined (__TI_COMPILER_VERSION__)
@ -164,7 +164,7 @@ typedef rt_base_t rt_off_t; /**< Type for offset */
#define RT_USED
#define PRAGMA(x) _Pragma(#x)
#define ALIGN(n)
#define WEAK
#define RT_WEAK
#define rt_inline static inline
#define RTT_API
#else

2
src/kservice.c
View File

@ -1101,7 +1101,7 @@ rt_device_t rt_console_set_device(const char *name)
RTM_EXPORT(rt_console_set_device);
#endif
WEAK void rt_hw_console_output(const char *str)
RT_WEAK void rt_hw_console_output(const char *str)
{
/* empty console output */
}