Make macros safe.

diff --git a/src/core/ngx_config.h b/src/core/ngx_config.h
index b0cb17fca80be530726af28c97adc17ee3e9778d..1da71f8d1a176a1bc2b1abcac59fc5acea41bfae 100644 (file)
--- a/src/core/ngx_config.h
+++ b/src/core/ngx_config.h
@@ -80,8 +80,8 @@ typedef uintptr_t       ngx_uint_t;
 typedef intptr_t        ngx_flag_t;
 
 
-#define NGX_INT32_LEN   sizeof("-2147483648") - 1
-#define NGX_INT64_LEN   sizeof("-9223372036854775808") - 1
+#define NGX_INT32_LEN   (sizeof("-2147483648") - 1)
+#define NGX_INT64_LEN   (sizeof("-9223372036854775808") - 1)
 
 #if (NGX_PTR_SIZE == 4)
 #define NGX_INT_T_LEN   NGX_INT32_LEN

diff --git a/src/os/unix/ngx_files.h b/src/os/unix/ngx_files.h
index 9c97e2bb789b6404ef597fe77313c8943c805880..4e3ed7db41566ed7f00297b1bebd379f312ed780 100644 (file)
--- a/src/os/unix/ngx_files.h
+++ b/src/os/unix/ngx_files.h
@@ -72,8 +72,8 @@ typedef struct {
 #define NGX_FILE_RDWR            O_RDWR
 #define NGX_FILE_CREATE_OR_OPEN  O_CREAT
 #define NGX_FILE_OPEN            0
-#define NGX_FILE_TRUNCATE        O_CREAT|O_TRUNC
-#define NGX_FILE_APPEND          O_WRONLY|O_APPEND
+#define NGX_FILE_TRUNCATE        (O_CREAT|O_TRUNC)
+#define NGX_FILE_APPEND          (O_WRONLY|O_APPEND)
 #define NGX_FILE_NONBLOCK        O_NONBLOCK
 
 #if (NGX_HAVE_OPENAT)
@@ -86,13 +86,13 @@ typedef struct {
 #endif
 
 #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)
-#define NGX_FILE_SEARCH          O_EXEC|NGX_FILE_DIRECTORY
+#define NGX_FILE_SEARCH          (O_EXEC|NGX_FILE_DIRECTORY)
 
 #else
-#define NGX_FILE_SEARCH          O_RDONLY|NGX_FILE_DIRECTORY
+#define NGX_FILE_SEARCH          (O_RDONLY|NGX_FILE_DIRECTORY)
 #endif
 
 #endif /* NGX_HAVE_OPENAT */

diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index 3f3b3e3faa8d672ec02696779b6918b139debdb6..62356985561504e532341a08cae93590e5516733 100644 (file)
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -142,11 +142,11 @@ typedef int                 sig_atomic_t;
 
 
 #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_TIME_T_LEN          sizeof("-2147483648") - 1
+#define NGX_TIME_T_LEN          (sizeof("-2147483648") - 1)
 #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_SIG_ATOMIC_T_SIZE   4