comparison src/core/ngx_conf_file.h @ 383:c05876036128

nginx-0.0.7-2004-07-08-19:17:47 import
author Igor Sysoev <igor@sysoev.ru>
date Thu, 08 Jul 2004 15:17:47 +0000
parents 2e3cbc1bbe3c
children d6e2b445c1b8
comparison
equal deleted inserted replaced
382:449c4885dcd1 383:c05876036128
43 43
44 44
45 45
46 #define NGX_CONF_UNSET -1 46 #define NGX_CONF_UNSET -1
47 #define NGX_CONF_UNSET_UINT (ngx_uint_t) -1 47 #define NGX_CONF_UNSET_UINT (ngx_uint_t) -1
48 #define NGX_CONF_UNSET_PTR (void *) -1
48 #define NGX_CONF_UNSET_SIZE (size_t) -1 49 #define NGX_CONF_UNSET_SIZE (size_t) -1
49 #define NGX_CONF_UNSET_MSEC (ngx_msec_t) -1 50 #define NGX_CONF_UNSET_MSEC (ngx_msec_t) -1
50 51
51 52
52 #define NGX_CONF_OK NULL 53 #define NGX_CONF_OK NULL
179 if (conf == NGX_CONF_UNSET) { \ 180 if (conf == NGX_CONF_UNSET) { \
180 conf = default; \ 181 conf = default; \
181 } 182 }
182 183
183 #define ngx_conf_init_ptr_value(conf, default) \ 184 #define ngx_conf_init_ptr_value(conf, default) \
184 if (conf == (void *) NGX_CONF_UNSET) { \ 185 if (conf == NGX_CONF_UNSET_PTR) { \
185 conf = default; \ 186 conf = default; \
186 } 187 }
187 188
188 #define ngx_conf_init_unsigned_value(conf, default) \ 189 #define ngx_conf_init_unsigned_value(conf, default) \
189 if (conf == (unsigned) NGX_CONF_UNSET) { \ 190 if (conf == (unsigned) NGX_CONF_UNSET) { \
201 } 202 }
202 203
203 #define ngx_conf_merge_value(conf, prev, default) \ 204 #define ngx_conf_merge_value(conf, prev, default) \
204 if (conf == NGX_CONF_UNSET) { \ 205 if (conf == NGX_CONF_UNSET) { \
205 conf = (prev == NGX_CONF_UNSET) ? default : prev; \ 206 conf = (prev == NGX_CONF_UNSET) ? default : prev; \
207 }
208
209 #define ngx_conf_merge_ptr_value(conf, prev, default) \
210 if (conf == NULL) { \
211 conf = (prev == NULL) ? default : prev; \
206 } 212 }
207 213
208 #define ngx_conf_merge_unsigned_value(conf, prev, default) \ 214 #define ngx_conf_merge_unsigned_value(conf, prev, default) \
209 if (conf == NGX_CONF_UNSET_UINT) { \ 215 if (conf == NGX_CONF_UNSET_UINT) { \
210 conf = (prev == NGX_CONF_UNSET_UINT) ? default : prev; \ 216 conf = (prev == NGX_CONF_UNSET_UINT) ? default : prev; \