Mercurial > hg > nginx-quic
comparison src/core/ngx_conf_file.h @ 1523:b7d39d0b0025 stable-0.5
r1453 merge:
change ngx_conf_merge_ptr_value() and update fastcgi_catch_stderr
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 23 Sep 2007 19:15:42 +0000 |
parents | 6d5c1535bb9d |
children |
comparison
equal
deleted
inserted
replaced
1522:ba92cccf5435 | 1523:b7d39d0b0025 |
---|---|
255 if (conf == NGX_CONF_UNSET) { \ | 255 if (conf == NGX_CONF_UNSET) { \ |
256 conf = (prev == NGX_CONF_UNSET) ? default : prev; \ | 256 conf = (prev == NGX_CONF_UNSET) ? default : prev; \ |
257 } | 257 } |
258 | 258 |
259 #define ngx_conf_merge_ptr_value(conf, prev, default) \ | 259 #define ngx_conf_merge_ptr_value(conf, prev, default) \ |
260 if (conf == NULL) { \ | 260 if (conf == NGX_CONF_UNSET_PTR) { \ |
261 conf = (prev == NULL) ? default : prev; \ | 261 conf = (prev == NGX_CONF_UNSET_PTR) ? default : prev; \ |
262 } | 262 } |
263 | 263 |
264 #define ngx_conf_merge_uint_value(conf, prev, default) \ | 264 #define ngx_conf_merge_uint_value(conf, prev, default) \ |
265 if (conf == NGX_CONF_UNSET_UINT) { \ | 265 if (conf == NGX_CONF_UNSET_UINT) { \ |
266 conf = (prev == NGX_CONF_UNSET_UINT) ? default : prev; \ | 266 conf = (prev == NGX_CONF_UNSET_UINT) ? default : prev; \ |