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

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
comparison
equal deleted inserted replaced
58:6b13b1cadabe 59:e8cdc2989cee
81 if (conf == NGX_CONF_UNSET) { \ 81 if (conf == NGX_CONF_UNSET) { \
82 conf = (prev == NGX_CONF_UNSET) ? default : prev; \ 82 conf = (prev == NGX_CONF_UNSET) ? default : prev; \
83 } 83 }
84 84
85 85
86 #define ngx_conf_size_merge(conf, prev, default) \
87 if (conf == (size_t) NGX_CONF_UNSET) { \
88 conf = (prev == (size_t) NGX_CONF_UNSET) ? default : prev; \
89 }
90
91
86 92
87 char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename); 93 char *ngx_conf_parse(ngx_conf_t *cf, ngx_str_t *filename);
88 94
89 95
90 char *ngx_conf_set_str_slot(ngx_conf_t *cf, ngx_command_t *cmd, char *conf); 96 char *ngx_conf_set_str_slot(ngx_conf_t *cf, ngx_command_t *cmd, char *conf);
93 99
94 100
95 extern ngx_module_t *ngx_modules[]; 101 extern ngx_module_t *ngx_modules[];
96 102
97 103
98 #endif _NGX_HTTP_CONF_FILE_H_INCLUDED_ 104 #endif /* _NGX_HTTP_CONF_FILE_H_INCLUDED_ */