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

!161 fix: fix NULL、UNUSED redefined issue 

Merge pull request !161 from kenneth/NULL_redefined3
This commit is contained in:
openharmony_ci 2021-06-04 14:51:52 +08:00 committed by Gitee
parent 3d2a102d35 765bd55199
commit beea9963f7
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils/los_compiler.h
View File

@ -335,7 +335,7 @@ typedef signed int INTPTR;
#ifdef __cplusplus #ifdef __cplusplus
#define NULL 0L #define NULL 0L
#else #else
#define NULL ((VOID *)0) #define NULL ((void*)0)
#endif #endif
#endif #endif
@ -411,10 +411,7 @@ static inline UINT32 LOS_Align(UINT32 addr, UINT32 boundary)
} while (0) } while (0)
#ifndef UNUSED #ifndef UNUSED
#define UNUSED(var) \ #define UNUSED(X) (void)X
do { \
(void)var; \
} while (0)
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus