diff options
| author | Bernard Xiong <[email protected]> | 2013-09-02 00:12:03 -0700 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2013-09-02 00:12:03 -0700 |
| commit | 51ce91f30b7ed7e1184899390bc1843aae4e31ab (patch) | |
| tree | 68eae773224377b2f12e396ebdb095178d4022a6 /components | |
| parent | e2a0b1930bb2e2af3069fcb0c35874b6634cfc8c (diff) | |
| parent | c05b2053904dbcef44a000230860b56586c87a71 (diff) | |
Merge pull request #151 from grissiom/finsh
finsh: use alias in the variable definition
Diffstat (limited to 'components')
| -rw-r--r-- | components/finsh/finsh.h | 47 |
1 files changed, 24 insertions, 23 deletions
diff --git a/components/finsh/finsh.h b/components/finsh/finsh.h index 99851e8d36..c93986de6e 100644 --- a/components/finsh/finsh.h +++ b/components/finsh/finsh.h @@ -237,33 +237,34 @@ struct finsh_sysvar* finsh_sysvar_lookup(const char* name); */ #ifdef _MSC_VER #define FINSH_FUNCTION_EXPORT_ALIAS(name, alias, desc) \ - const char __fsym_##name##_name[] = #alias; \ - const char __fsym_##name##_desc[] = #desc; \ - __declspec(allocate("FSymTab$f")) const struct finsh_syscall __fsym_##name = \ + const char __fsym_##alias##_name[] = #alias; \ + const char __fsym_##alias##_desc[] = #desc; \ + __declspec(allocate("FSymTab$f")) \ + const struct finsh_syscall __fsym_##alias = \ { \ - __fsym_##name##_name, \ - __fsym_##name##_desc, \ + __fsym_##alias##_name, \ + __fsym_##alias##_desc, \ (syscall_func)&name \ }; #elif defined(__TI_COMPILER_VERSION__) #define FINSH_FUNCTION_EXPORT_ALIAS(name, alias, desc) \ - __TI_FINSH_EXPORT_FUNCTION(__fsym_##name); \ - const char __fsym_##name##_name[] = #alias; \ - const char __fsym_##name##_desc[] = #desc; \ - const struct finsh_syscall __fsym_##name = \ + __TI_FINSH_EXPORT_FUNCTION(__fsym_##alias); \ + const char __fsym_##alias##_name[] = #alias; \ + const char __fsym_##alias##_desc[] = #desc; \ + const struct finsh_syscall __fsym_##alias = \ { \ - __fsym_##name##_name, \ - __fsym_##name##_desc, \ + __fsym_##alias##_name, \ + __fsym_##alias##_desc, \ (syscall_func)&name \ }; #else #define FINSH_FUNCTION_EXPORT_ALIAS(name, alias, desc) \ - const char __fsym_##name##_name[] = #alias; \ - const char __fsym_##name##_desc[] = #desc; \ - const struct finsh_syscall __fsym_##name SECTION("FSymTab")= \ + const char __fsym_##alias##_name[] = #alias; \ + const char __fsym_##alias##_desc[] = #desc; \ + const struct finsh_syscall __fsym_##alias SECTION("FSymTab")= \ { \ - __fsym_##name##_name, \ - __fsym_##name##_desc, \ + __fsym_##alias##_name, \ + __fsym_##alias##_desc, \ (syscall_func)&name \ }; #endif /* FINSH_FUNCTION_EXPORT_ALIAS defines */ @@ -324,11 +325,11 @@ struct finsh_sysvar* finsh_sysvar_lookup(const char* name); (syscall_func)&name \ }; #define FINSH_FUNCTION_EXPORT_ALIAS(name, alias, desc) \ - const char __fsym_##name##_name[] = #alias; \ - __TI_FINSH_EXPORT_FUNCTION(__fsym_##name); \ - const struct finsh_syscall __fsym_##name = \ + const char __fsym_##alias##_name[] = #alias; \ + __TI_FINSH_EXPORT_FUNCTION(__fsym_##alias); \ + const struct finsh_syscall __fsym_##alias = \ { \ - __fsym_##name##_name, \ + __fsym_##alias##_name, \ (syscall_func)&name \ }; @@ -351,10 +352,10 @@ struct finsh_sysvar* finsh_sysvar_lookup(const char* name); }; #define FINSH_FUNCTION_EXPORT_ALIAS(name, alias, desc) \ - const char __fsym_##name##_name[] = #alias; \ - const struct finsh_syscall __fsym_##name SECTION("FSymTab")= \ + const char __fsym_##alias##_name[] = #alias; \ + const struct finsh_syscall __fsym_##alias SECTION("FSymTab")= \ { \ - __fsym_##name##_name, \ + __fsym_##alias##_name, \ (syscall_func)&name \ }; |