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_tick.c
+++ b/kernel/src/los_tick.c
@@ -35,11 +35,6 @@
 #include "los_swtmr.h"
 #include "los_sched.h"

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

 LITE_OS_SEC_BSS UINT32 g_ticksPerSec;
 LITE_OS_SEC_BSS UINT32 g_uwCyclePerSec;
@@ -183,8 +178,3 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsCpuTick2US(CpuTick *cpuTick, UINT32 *usHi, UINT32
 }


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