comparison src/core/ngx_conf_file.h @ 290:87e73f067470

nginx-0.0.2-2004-03-16-10:10:12 import
author Igor Sysoev <igor@sysoev.ru>
date Tue, 16 Mar 2004 07:10:12 +0000
parents 70e1c7d2b83d
children a472bfb778b3
comparison
equal deleted inserted replaced
289:0750faf8d7e3 290:87e73f067470
41 #define NGX_MAIN_CONF 0x01000000 41 #define NGX_MAIN_CONF 0x01000000
42 42
43 43
44 44
45 #define NGX_CONF_UNSET -1 45 #define NGX_CONF_UNSET -1
46 #define NGX_CONF_UNSET_SIZE (size_t) -1
47 #define NGX_CONF_UNSET_MSEC (ngx_msec_t) -1
46 48
47 49
48 #define NGX_CONF_OK NULL 50 #define NGX_CONF_OK NULL
49 #define NGX_CONF_ERROR (void *) -1 51 #define NGX_CONF_ERROR (void *) -1
50 52
187 if (conf == NGX_CONF_UNSET) { \ 189 if (conf == NGX_CONF_UNSET) { \
188 conf = (prev == NGX_CONF_UNSET) ? default : prev; \ 190 conf = (prev == NGX_CONF_UNSET) ? default : prev; \
189 } 191 }
190 192
191 #define ngx_conf_merge_msec_value(conf, prev, default) \ 193 #define ngx_conf_merge_msec_value(conf, prev, default) \
192 if (conf == (ngx_msec_t) NGX_CONF_UNSET) { \ 194 if (conf == NGX_CONF_UNSET_MSEC) { \
193 conf = (prev == (ngx_msec_t) NGX_CONF_UNSET) ? default : prev; \ 195 conf = (prev == NGX_CONF_UNSET_MSEC) ? default : prev; \
194 } 196 }
195 197
196 #define ngx_conf_merge_sec_value(conf, prev, default) \ 198 #define ngx_conf_merge_sec_value(conf, prev, default) \
197 if (conf == NGX_CONF_UNSET) { \ 199 if (conf == NGX_CONF_UNSET) { \
198 conf = (prev == NGX_CONF_UNSET) ? default : prev; \ 200 conf = (prev == NGX_CONF_UNSET) ? default : prev; \
199 } 201 }
200 202
201 #define ngx_conf_merge_size_value(conf, prev, default) \ 203 #define ngx_conf_merge_size_value(conf, prev, default) \
202 if (conf == (ssize_t) NGX_CONF_UNSET) { \ 204 if (conf == NGX_CONF_UNSET_SIZE) { \
203 conf = (prev == (ssize_t) NGX_CONF_UNSET) ? default : prev; \ 205 conf = (prev == NGX_CONF_UNSET_SIZE) ? default : prev; \
204 } 206 }
205 207
206 #define ngx_conf_merge_str_value(conf, prev, default) \ 208 #define ngx_conf_merge_str_value(conf, prev, default) \
207 if (conf.len == 0) { \ 209 if (conf.len == 0) { \
208 if (prev.len) { \ 210 if (prev.len) { \