From 34cec29e0cc227978868a30f22051948c4922336 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 3 Mar 2008 16:32:16 +0000 Subject: [PATCH] C++ compatibility --- src/core/ngx_file.c | 2 +- src/core/ngx_file.h | 2 +- src/http/modules/ngx_http_dav_module.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c index 37d12e1fd..b98108abe 100644 --- a/src/core/ngx_file.c +++ b/src/core/ngx_file.c @@ -554,7 +554,7 @@ ngx_ext_rename_file(ngx_str_t *src, ngx_str_t *to, ngx_ext_rename_file_t *ext) failed: - if (ext->delete) { + if (ext->delete_file) { if (ngx_delete_file(src->data) == NGX_FILE_ERROR) { ngx_log_error(NGX_LOG_CRIT, ext->log, ngx_errno, ngx_delete_file_n " \"%s\" failed", src->data); diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h index a5637bbc5..a254ca753 100644 --- a/src/core/ngx_file.h +++ b/src/core/ngx_file.h @@ -63,7 +63,7 @@ typedef struct { ngx_fd_t fd; unsigned create_path:1; - unsigned delete:1; + unsigned delete_file:1; ngx_log_t *log; } ngx_ext_rename_file_t; diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c index e597923e0..b1e0831b1 100644 --- a/src/http/modules/ngx_http_dav_module.c +++ b/src/http/modules/ngx_http_dav_module.c @@ -248,7 +248,7 @@ ngx_http_dav_put_handler(ngx_http_request_t *r) ext.access = dlcf->access; ext.time = -1; ext.create_path = dlcf->create_full_put_path; - ext.delete = 1; + ext.delete_file = 1; ext.log = r->connection->log; if (r->headers_in.date) {