fix:Solution of conflict.

Close #I3IK07 Change-Id: I6913691a28c90b54fbda233209d43b981884f10c
2021-04-20 14:56:26 +08:00
parent bad8c3d53b 4474869a07
commit 793d2139b2
620 changed files with 2 additions and 5971 deletions
--- a/kernel/src/los_task.c
+++ b/kernel/src/los_task.c
@@ -45,11 +45,6 @@
 #include "los_cpup.h"
 #endif

-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */

 /**
 * @ingroup los_task
@@ -1301,8 +1296,3 @@ LITE_OS_SEC_TEXT_MINOR VOID LOS_Msleep(UINT32 mSecs)
    (VOID)LOS_TaskDelay(interval);
 }

-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __cplusplus */