remove __cplusplus guards in .c files
Change-Id: Ie25b83a42d3ca35c3a6d624ef01f425a85957d7f
This commit is contained in:
Executable → Regular
-10
@@ -46,11 +46,6 @@
|
||||
#include "string.h"
|
||||
#include "securec.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
#if __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
#endif /* __cplusplus */
|
||||
#if (CMSIS_OS_VER == 2)
|
||||
|
||||
/* Kernel initialization state */
|
||||
@@ -1652,8 +1647,3 @@ const char *osMemoryPoolGetName(osMemoryPoolId_t mp_id)
|
||||
}
|
||||
|
||||
#endif // (CMSIS_OS_VER == 2)
|
||||
#ifdef __cplusplus
|
||||
#if __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
#endif /* __cplusplus */
|
||||
|
||||
@@ -33,11 +33,6 @@
|
||||
#include "los_interrupt.h"
|
||||
#include "los_swtmr.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
#if __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cpluscplus */
|
||||
#endif /* __cpluscplus */
|
||||
|
||||
#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1)
|
||||
osTimerId_t osTimerExtNew(osTimerFunc_t func, osTimerType_t type, void *argument, const osTimerAttr_t *attr,
|
||||
@@ -65,8 +60,3 @@ osTimerId_t osTimerExtNew(osTimerFunc_t func, osTimerType_t type, void *argument
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
#if __cplusplus
|
||||
}
|
||||
#endif /* __cpluscplus */
|
||||
#endif /* __cpluscplus */
|
||||
Executable → Regular
Executable → Regular
@@ -2,9 +2,6 @@
|
||||
#include "los_context.h"
|
||||
#include "los_debug.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif /* __cplusplus */
|
||||
|
||||
void __assert(const char* file, int line, const char* expr) {
|
||||
PRINT_ERR("__assert error: %s, %d, %s\n", file, line, expr);
|
||||
@@ -23,7 +20,3 @@ void __assert_fail(const char* expr, const char* file, int line, const char* fun
|
||||
LOS_Panic("__assert error:\n");
|
||||
while (1);
|
||||
}
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif /* __cplusplus */
|
||||
@@ -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 */
|
||||
|
||||
Executable → Regular
-10
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user