Merge pull request #5510 from 0xc0170/fix_nuvoton_truefalse

[M487/NUC472/NANO130] fix TRUE/FALSE redefinition
pull/5358/merge
Martin Kojtal 2017-11-16 16:09:39 +00:00 committed by GitHub
commit f36922cb0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 0 deletions

View File

@ -35908,8 +35908,12 @@ typedef volatile unsigned long vu32; ///< Define 32-bit unsigned volatile
#define NULL (0) ///< NULL pointer
#endif
#ifndef TRUE
#define TRUE (1UL) ///< Boolean true, define to use in API parameters or return value
#endif
#ifndef FALSE
#define FALSE (0UL) ///< Boolean false, define to use in API parameters or return value
#endif
#define ENABLE (1UL) ///< Enable, define to use in API parameters
#define DISABLE (0UL) ///< Disable, define to use in API parameters

View File

@ -11831,8 +11831,12 @@ typedef volatile unsigned long vu32; ///< Define 32-bit unsigned volatile
#define NULL (0) ///< NULL pointer
#endif
#ifndef TRUE
#define TRUE (1) ///< Boolean true, define to use in API parameters or return value
#endif
#ifndef FALSE
#define FALSE (0) ///< Boolean false, define to use in API parameters or return value
#endif
#define ENABLE (1) ///< Enable, define to use in API parameters
#define DISABLE (0) ///< Disable, define to use in API parameters

View File

@ -32511,8 +32511,12 @@ typedef volatile unsigned long vu32; ///< Define 32-bit unsigned volatile
#define NULL (0) ///< NULL pointer
#endif
#ifndef TRUE
#define TRUE (1) ///< Boolean true, define to use in API parameters or return value
#endif
#ifndef FALSE
#define FALSE (0) ///< Boolean false, define to use in API parameters or return value
#endif
#define ENABLE (1) ///< Enable, define to use in API parameters
#define DISABLE (0) ///< Disable, define to use in API parameters