diff --git a/kernel/include/limits.h b/kernel/include/limits.h index c818b31c7b0f561ad8653e26acf759864ec2fa08..6e1a9db2cf0c2a55f776d309ba05d35b46bfde65 100755 --- a/kernel/include/limits.h +++ b/kernel/include/limits.h @@ -5,6 +5,8 @@ #include /* __LONG_MAX */ +#include "los_config.h" + #ifndef PAGE_SIZE #define PAGE_SIZE 4096 #endif diff --git a/kernel/src/stdio/vfprintf.c b/kernel/src/stdio/vfprintf.c index bb8c00bad3db5b17549eac8a817f7092413c3cdc..09e252dfcb5cacab3f20c988a56e35f73f723a5c 100644 --- a/kernel/src/stdio/vfprintf.c +++ b/kernel/src/stdio/vfprintf.c @@ -1,7 +1,10 @@ #include "stdio_impl.h" #include #include +/* Undef the CHAR macro definition in los_typedef.h to avoid conflicts with the following CHAR */ +#define CHAR _CHAR #include +#undef CHAR #include #include #include diff --git a/kernel_m/include/limits.h b/kernel_m/include/limits.h index 20fda4a1b7accb0baf1775b6e8a811f608535a0a..78ca831ff2cc5ef9d4784d749fb59eb81677c59b 100755 --- a/kernel_m/include/limits.h +++ b/kernel_m/include/limits.h @@ -70,9 +70,9 @@ #define PTHREAD_KEYS_MAX 128 #define PTHREAD_STACK_MIN 2048 #define PTHREAD_DESTRUCTOR_ITERATIONS 4 -#define SEM_VALUE_MAX 0x7fffffff +#define SEM_VALUE_MAX 0xffff #define SEM_NSEMS_MAX 256 -#define DELAYTIMER_MAX 0x7fffffff +#define DELAYTIMER_MAX 32 #define MQ_PRIO_MAX 32768 #define LOGIN_NAME_MAX 256