C++ compatibility

diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index 37d12e1fd76ef7249566700b82c8cef78d63720f..b98108abecf10e8d0ac10cb2828bb94253044ca7 100644 (file)
--- 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 a5637bbc561c9cd8978247014c664911bdfdba42..a254ca75318349031f706b50e0c22198c818db89 100644 (file)
--- 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 e597923e03390be1a420a8a10d5960d4107d11be..b1e0831b1877bff1fd3e1bceeacbb6d5e9838f87 100644 (file)
--- 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) {