diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-09-05 15:43:34 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-09-05 15:43:34 +0000 |
| commit | dfc8dadd04c7150d0f074bf650fab7beb4593513 (patch) | |
| tree | be0253a03cd2d85767f833d8f662f7265c0ce4cb /src/os/win32 | |
| parent | 5d4e80b8fbfff6d2ab3948b19c5711cc03211e6d (diff) | |
| download | nginx-dfc8dadd04c7150d0f074bf650fab7beb4593513.tar.gz nginx-dfc8dadd04c7150d0f074bf650fab7beb4593513.tar.bz2 | |
*) autoconfigure struct dirent capabilities
*) move src/os/.../ngx_types.h's content into src/os/.../ngx_files.h and
delete src/os/.../ngx_types.h
Diffstat (limited to 'src/os/win32')
| -rw-r--r-- | src/os/win32/ngx_files.c | 1 | ||||
| -rw-r--r-- | src/os/win32/ngx_files.h | 44 | ||||
| -rw-r--r-- | src/os/win32/ngx_types.h | 28 |
3 files changed, 31 insertions, 42 deletions
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c index 2d8989060..20b528668 100644 --- a/src/os/win32/ngx_files.c +++ b/src/os/win32/ngx_files.c @@ -330,6 +330,7 @@ ngx_open_dir(ngx_str_t *name, ngx_dir_t *dir) } dir->valid_info = 1; + dir->valid_type = 1; dir->ready = 1; return NGX_OK; diff --git a/src/os/win32/ngx_files.h b/src/os/win32/ngx_files.h index d6a5e375c..9f4f68199 100644 --- a/src/os/win32/ngx_files.h +++ b/src/os/win32/ngx_files.h @@ -12,6 +12,36 @@ #include <ngx_core.h> +typedef HANDLE ngx_fd_t; +typedef BY_HANDLE_FILE_INFORMATION ngx_file_info_t; +typedef uint64_t ngx_file_uniq_t; + +typedef struct { + HANDLE dir; + WIN32_FIND_DATA finddata; + + unsigned valid_info:1; + unsigned valid_type:1; + unsigned ready:1; +} ngx_dir_t; + + +typedef struct { + HANDLE dir; + WIN32_FIND_DATA finddata; + + unsigned ready:1; + unsigned test:1; + unsigned no_match:1; + + u_char *pattern; + ngx_str_t name; + size_t last; + ngx_log_t *log; +} ngx_glob_t; + + + /* INVALID_FILE_ATTRIBUTES is specified but not defined at least in MSVC6SP2 */ #ifndef INVALID_FILE_ATTRIBUTES #define INVALID_FILE_ATTRIBUTES 0xffffffff @@ -184,20 +214,6 @@ ngx_int_t ngx_de_link_info(u_char *name, ngx_dir_t *dir); | (dir)->finddata.ftLastWriteTime.dwLowDateTime) \ - 116444736000000000) / 10000000) -typedef struct { - HANDLE dir; - WIN32_FIND_DATA finddata; - - unsigned ready:1; - unsigned test:1; - unsigned no_match:1; - - u_char *pattern; - ngx_str_t name; - size_t last; - ngx_log_t *log; -} ngx_glob_t; - ngx_int_t ngx_open_glob(ngx_glob_t *gl); #define ngx_open_glob_n "FindFirstFile()" diff --git a/src/os/win32/ngx_types.h b/src/os/win32/ngx_types.h deleted file mode 100644 index 009ccc9de..000000000 --- a/src/os/win32/ngx_types.h +++ /dev/null @@ -1,28 +0,0 @@ - -/* - * Copyright (C) Igor Sysoev - */ - - -#ifndef _NGX_TYPES_H_INCLUDED_ -#define _NGX_TYPES_H_INCLUDED_ - - -#include <ngx_config.h> -#include <ngx_core.h> - - -typedef HANDLE ngx_fd_t; -typedef BY_HANDLE_FILE_INFORMATION ngx_file_info_t; -typedef uint64_t ngx_file_uniq_t; - -typedef struct { - HANDLE dir; - WIN32_FIND_DATA finddata; - - unsigned valid_info:1; - unsigned ready:1; -} ngx_dir_t; - - -#endif /* _NGX_TYPES_H_INCLUDED_ */ |