commit 34cec29e0cc227978868a30f22051948c4922336
author Igor Sysoev <igor@sysoev.ru> Mon Mar 03 16:32:16 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Mon Mar 03 16:32:16 2008 +0000
tree 4d739523cf9f91893cc000f43d2c43344df5c00a
parent 7c15b75cc792c5e5c8d2af219d84e7dcb8e5be6b

C++ compatibility

src/core/ngx_file.c

diff --git a/src/core/ngx_file.c b/src/core/ngx_file.c
index 37d12e1..b98108a 100644
--- a/src/core/ngx_file.c
+++ b/src/core/ngx_file.c
@@ -554,7 +554,7 @@
 
 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);

src/core/ngx_file.h

diff --git a/src/core/ngx_file.h b/src/core/ngx_file.h
index a5637bb..a254ca7 100644
--- a/src/core/ngx_file.h
+++ b/src/core/ngx_file.h
@@ -63,7 +63,7 @@
     ngx_fd_t            fd;
 
     unsigned            create_path:1;
-    unsigned            delete:1;
+    unsigned            delete_file:1;
 
     ngx_log_t          *log;
 } ngx_ext_rename_file_t;

src/http/modules/ngx_http_dav_module.c

diff --git a/src/http/modules/ngx_http_dav_module.c b/src/http/modules/ngx_http_dav_module.c
index e597923..b1e0831 100644
--- a/src/http/modules/ngx_http_dav_module.c
+++ b/src/http/modules/ngx_http_dav_module.c
@@ -248,7 +248,7 @@
     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) {