]> git.kaiwu.me - nginx.git/commitdiff
fix win32 ngx_is_dir(), etc
authorIgor Sysoev <igor@sysoev.ru>
Wed, 21 Jan 2009 15:53:09 +0000 (15:53 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Wed, 21 Jan 2009 15:53:09 +0000 (15:53 +0000)
src/os/win32/ngx_files.h

index 174c6f574b22741ec33a0f94171d67a8542d1e62..5855e673f5af9b09c353d3b485b9ec65a8e2a604 100644 (file)
@@ -132,8 +132,10 @@ ngx_int_t ngx_file_info(u_char *filename, ngx_file_info_t *fi);
 #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, ngx_dir_t *dir);
 #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)                                                     \