diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2005-02-22 14:40:13 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2005-02-22 14:40:13 +0000 |
| commit | d039a2e193c9172e4f415b9304222e81804a69d0 (patch) | |
| tree | 4571d4da7950e9464e788a4d68dc5111167de52c /src/core/ngx_file.h | |
| parent | 174db74f2309e28c0e2b54e89b9e08afff187c7c (diff) | |
| download | nginx-d039a2e193c9172e4f415b9304222e81804a69d0.tar.gz nginx-d039a2e193c9172e4f415b9304222e81804a69d0.zip | |
nginx-0.1.21-RELEASE importrelease-0.1.21
*) Bugfix: the ngx_http_stub_status_module showed incorrect statistics
if "rtsig" method was used or if several worker process ran on SMP.
*) Bugfix: nginx could not be built by the icc compiler on Linux or if
the zlib-1.2.x library was building from sources.
*) Bugfix: nginx could not be built on NetBSD 2.0.
Diffstat (limited to 'src/core/ngx_file.h')
| -rw-r--r-- | src/core/ngx_file.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h index bc64ed8e9..a76a64877 100644 --- a/src/core/ngx_file.h +++ b/src/core/ngx_file.h @@ -55,14 +55,14 @@ typedef struct { ssize_t ngx_write_chain_to_temp_file(ngx_temp_file_t *tf, ngx_chain_t *chain); ngx_int_t ngx_create_temp_file(ngx_file_t *file, ngx_path_t *path, - ngx_pool_t *pool, int persistent); + ngx_pool_t *pool, int persistent); void ngx_create_hashed_filename(ngx_file_t *file, ngx_path_t *path); ngx_int_t ngx_create_path(ngx_file_t *file, ngx_path_t *path); ngx_int_t ngx_add_path(ngx_conf_t *cf, ngx_path_t **slot); ngx_int_t ngx_create_pathes(ngx_cycle_t *cycle, ngx_uid_t user); void ngx_init_temp_number(); -ngx_uint_t ngx_next_temp_number(ngx_uint_t collision); +ngx_atomic_int_t ngx_next_temp_number(ngx_uint_t collision); char *ngx_conf_set_path_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); |