C++ compatibility

This commit is contained in:
Igor Sysoev 2008-03-03 16:32:16 +00:00
parent 7c15b75cc7
commit 34cec29e0c
3 changed files with 3 additions and 3 deletions

View File

@ -554,7 +554,7 @@ ngx_ext_rename_file(ngx_str_t *src, ngx_str_t *to, ngx_ext_rename_file_t *ext)
failed: failed:
if (ext->delete) { if (ext->delete_file) {
if (ngx_delete_file(src->data) == NGX_FILE_ERROR) { if (ngx_delete_file(src->data) == NGX_FILE_ERROR) {
ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno, ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno,
ngx_delete_file_n " \"%s\" failed", src->data); ngx_delete_file_n " \"%s\" failed", src->data);

View File

@ -63,7 +63,7 @@ typedef struct {
ngx_fd_t fd; ngx_fd_t fd;
unsigned create_path:1; unsigned create_path:1;
unsigned delete:1; unsigned delete_file:1;
ngx_log_t *log; ngx_log_t *log;
} ngx_ext_rename_file_t; } ngx_ext_rename_file_t;

View File

@ -248,7 +248,7 @@ ngx_http_dav_put_handler(ngx_http_request_t *r)
ext.access = dlcf->access; ext.access = dlcf->access;
ext.time = -1; ext.time = -1;
ext.create_path = dlcf->create_full_put_path; ext.create_path = dlcf->create_full_put_path;
ext.delete = 1; ext.delete_file = 1;
ext.log = r->connection->log; ext.log = r->connection->log;
if (r->headers_in.date) { if (r->headers_in.date) {