Mercurial > hg > nginx

diff src/core/ngx_conf_file.h @ 59:e8cdc2989cee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.1-2003-02-06-20:21:13 import
author Igor Sysoev <igor@sysoev.ru>
date Thu, 06 Feb 2003 17:21:13 +0000
parents f1ee46c036a4
children 34d647deb1da
line wrap: on
line diff
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -83,6 +83,12 @@ struct ngx_conf_s {
     }
 
 
+#define ngx_conf_size_merge(conf, prev, default)                             \
+    if (conf == (size_t) NGX_CONF_UNSET) {                                   \
+        conf = (prev == (size_t) NGX_CONF_UNSET) ? default : prev;           \
+    }
+
+
 
 char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename);
 
@@ -95,4 +101,4 @@ char *ngx_conf_set_time_slot(ngx_conf_t 
 extern ngx_module_t *ngx_modules[];
 
 
-#endif _NGX_HTTP_CONF_FILE_H_INCLUDED_
+#endif /* _NGX_HTTP_CONF_FILE_H_INCLUDED_ */