!703 TCB结构体扩展宏添加分号

Merge pull request !703 from 方烨/master
TCB结构体扩展宏添加分号
2022-06-14 05:47:21 +00:00 · 2022-06-14 11:31:18 +08:00
3 changed files with 5 additions and 5 deletions
--- a/components/iar_tls/los_iar_tls.h
+++ b/components/iar_tls/los_iar_tls.h
@@ -32,7 +32,7 @@
 #include "los_compiler.h"

 /* Using task extended field to realize IAR TLS function in target_config.h include this header file. */
-#define LOSCFG_TASK_STRUCT_EXTENSION    VOID *iarTlsArea;
+#define LOSCFG_TASK_STRUCT_EXTENSION    VOID *iarTlsArea

 #if (__VER__ < 8000000)
 #include <yvals.h>
--- a/kernel/include/los_config.h
+++ b/kernel/include/los_config.h
@@ -638,10 +638,8 @@ extern UINT8 *m_aucSysMem0;
 /**
 * @ingroup los_config
 * Task extension field additional functions, such as IAR TLS.
+ * Please Use the LOSCFG_TASK_STRUCT_EXTENSION macro to define your task extended fields in target_config.h
 */
-#ifndef LOSCFG_TASK_STRUCT_EXTENSION
-#define LOSCFG_TASK_STRUCT_EXTENSION
-#endif
 #ifndef LOSCFG_TASK_CREATE_EXTENSION_HOOK
 #define LOSCFG_TASK_CREATE_EXTENSION_HOOK(taskCB)
 #endif
--- a/kernel/include/los_task.h
+++ b/kernel/include/los_task.h
@@ -1500,7 +1500,9 @@ typedef struct {
 #if (LOSCFG_KERNEL_SIGNAL == 1)
    VOID                        *sig;                     /**< Task signal */
 #endif
-    LOSCFG_TASK_STRUCT_EXTENSION                          /**< Task extension field */
+#ifdef LOSCFG_TASK_STRUCT_EXTENSION
+    LOSCFG_TASK_STRUCT_EXTENSION;                         /**< Task extension field */
+#endif
 } LosTaskCB;

 STATIC INLINE BOOL OsTaskIsExit(const LosTaskCB *taskCB)
Author	SHA1	Message	Date
openharmony_ci	5df101eae5	!703 TCB结构体扩展宏添加分号 Merge pull request !703 from 方烨/master	2022-06-14 05:47:21 +00:00
fangye	128c3dffb5	TCB结构体扩展宏添加分号 Signed-off-by: fangye <fangye@talkweb.com.cn> Change-Id: Ic31310a1da1842adb1b19a0afb1448aa0f4720ef	2022-06-14 11:31:18 +08:00