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_queue.c
+++ b/kernel/src/los_queue.c
@@ -40,11 +40,6 @@
 #include "los_task.h"
 #include "los_sched.h"

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

 #if (LOSCFG_BASE_IPC_QUEUE == 1)

@@ -674,8 +669,3 @@ QUEUE_END:

 #endif /* (LOSCFG_BASE_IPC_QUEUE == 1) */

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