yystopf/openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:Solution of conflict.

Browse Source 
Close #I3IK07

Change-Id: I6913691a28c90b54fbda233209d43b981884f10c
This commit is contained in:
zhushengle
2021-04-20 14:56:26 +08:00
parent bad8c3d53b 4474869a07
commit 793d2139b2
620 changed files with 2 additions and 5971 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kal/posix/src/malloc.c
View File

@@ -33,11 +33,6 @@
#include "los_config.h"
#include "los_memory.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cpluscplus */
#endif /* __cpluscplus */
void *calloc(size_t nitems, size_t size)
{
@@ -112,8 +107,3 @@ void *realloc(void *ptr, size_t size)
return LOS_MemRealloc(OS_SYS_MEM_ADDR, ptr, size);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cpluscplus */
#endif /* __cpluscplus */

10
kal/posix/src/pthread_mutex.c Executable file → Normal file
View File

@@ -35,11 +35,6 @@
#include "los_mux.h"
#include "errno.h"
#ifdef __cplusplus
#if __cplusplus
extern "C" {
#endif /* __cplusplus */
#endif /* __cplusplus */
#define OS_SYS_NS_PER_MSECOND 1000000
#define OS_SYS_NS_PER_SECOND 1000000000
@@ -172,8 +167,3 @@ int pthread_mutex_unlock(pthread_mutex_t *mutex)
return MapError(ret);
}
#ifdef __cplusplus
#if __cplusplus
}
#endif /* __cplusplus */
#endif /* __cplusplus */