Make macros safe.

This commit is contained in:
Gleb Smirnoff 2013-07-05 11:42:25 +04:00
parent 523191ec89
commit 050f74b751
3 changed files with 10 additions and 10 deletions

View File

@ -80,8 +80,8 @@ typedef uintptr_t ngx_uint_t;
typedef intptr_t ngx_flag_t; typedef intptr_t ngx_flag_t;
#define NGX_INT32_LEN sizeof("-2147483648") - 1 #define NGX_INT32_LEN (sizeof("-2147483648") - 1)
#define NGX_INT64_LEN sizeof("-9223372036854775808") - 1 #define NGX_INT64_LEN (sizeof("-9223372036854775808") - 1)
#if (NGX_PTR_SIZE == 4) #if (NGX_PTR_SIZE == 4)
#define NGX_INT_T_LEN NGX_INT32_LEN #define NGX_INT_T_LEN NGX_INT32_LEN

View File

@ -72,8 +72,8 @@ typedef struct {
#define NGX_FILE_RDWR O_RDWR #define NGX_FILE_RDWR O_RDWR
#define NGX_FILE_CREATE_OR_OPEN O_CREAT #define NGX_FILE_CREATE_OR_OPEN O_CREAT
#define NGX_FILE_OPEN 0 #define NGX_FILE_OPEN 0
#define NGX_FILE_TRUNCATE O_CREAT|O_TRUNC #define NGX_FILE_TRUNCATE (O_CREAT|O_TRUNC)
#define NGX_FILE_APPEND O_WRONLY|O_APPEND #define NGX_FILE_APPEND (O_WRONLY|O_APPEND)
#define NGX_FILE_NONBLOCK O_NONBLOCK #define NGX_FILE_NONBLOCK O_NONBLOCK
#if (NGX_HAVE_OPENAT) #if (NGX_HAVE_OPENAT)
@ -86,13 +86,13 @@ typedef struct {
#endif #endif
#if defined(O_SEARCH) #if defined(O_SEARCH)
#define NGX_FILE_SEARCH O_SEARCH|NGX_FILE_DIRECTORY #define NGX_FILE_SEARCH (O_SEARCH|NGX_FILE_DIRECTORY)
#elif defined(O_EXEC) #elif defined(O_EXEC)
#define NGX_FILE_SEARCH O_EXEC|NGX_FILE_DIRECTORY #define NGX_FILE_SEARCH (O_EXEC|NGX_FILE_DIRECTORY)
#else #else
#define NGX_FILE_SEARCH O_RDONLY|NGX_FILE_DIRECTORY #define NGX_FILE_SEARCH (O_RDONLY|NGX_FILE_DIRECTORY)
#endif #endif
#endif /* NGX_HAVE_OPENAT */ #endif /* NGX_HAVE_OPENAT */

View File

@ -142,11 +142,11 @@ typedef int sig_atomic_t;
#define NGX_PTR_SIZE 4 #define NGX_PTR_SIZE 4
#define NGX_SIZE_T_LEN sizeof("-2147483648") - 1 #define NGX_SIZE_T_LEN (sizeof("-2147483648") - 1)
#define NGX_MAX_SIZE_T_VALUE 2147483647 #define NGX_MAX_SIZE_T_VALUE 2147483647
#define NGX_TIME_T_LEN sizeof("-2147483648") - 1 #define NGX_TIME_T_LEN (sizeof("-2147483648") - 1)
#define NGX_TIME_T_SIZE 4 #define NGX_TIME_T_SIZE 4
#define NGX_OFF_T_LEN sizeof("-9223372036854775807") - 1 #define NGX_OFF_T_LEN (sizeof("-9223372036854775807") - 1)
#define NGX_MAX_OFF_T_VALUE 9223372036854775807 #define NGX_MAX_OFF_T_VALUE 9223372036854775807
#define NGX_SIG_ATOMIC_T_SIZE 4 #define NGX_SIG_ATOMIC_T_SIZE 4