changeset 2461:2d3026ea9a65

fix win32 ngx_is_dir(), etc
author Igor Sysoev <igor@sysoev.ru>
date Wed, 21 Jan 2009 15:53:09 +0000
parents 225fa4abd76f
children 90d5ddfedbb1
files src/os/win32/ngx_files.h
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/os/win32/ngx_files.h
+++ b/src/os/win32/ngx_files.h
@@ -132,8 +132,10 @@ ngx_int_t ngx_file_info(u_char *filename
 #define ngx_fd_info_n               "GetFileInformationByHandle()"
 
 
-#define ngx_is_dir(fi)      ((fi)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
-#define ngx_is_file(fi)     !((fi)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+#define ngx_is_dir(fi)                                                       \
+    (((fi)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0)
+#define ngx_is_file(fi)                                                      \
+    (((fi)->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
 #define ngx_is_link(fi)     0
 #define ngx_is_exec(fi)     0
 
@@ -200,9 +202,9 @@ ngx_int_t ngx_de_link_info(u_char *name,
 #define ngx_de_link_info_n          "dummy()"
 
 #define ngx_de_is_dir(dir)                                                   \
-    ((dir)->finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+    (((dir)->finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0)
 #define ngx_de_is_file(dir)                                                  \
-    !((dir)->finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+    (((dir)->finddata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0)
 #define ngx_de_is_link(dir)         0
 #define ngx_de_access(dir)          0
 #define ngx_de_size(dir)                                                     \