Mercurial > hg > nginx

comparison src/core/ngx_conf_file.h @ 103:6dfda4cf5200

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.0.1-2003-06-11-19:28:34 import
author Igor Sysoev <igor@sysoev.ru>
date Wed, 11 Jun 2003 15:28:34 +0000
parents 7ebc8b7fb816
children 00bee6e7b485
comparison
equal deleted inserted replaced
102:7e86d028d8f0 103:6dfda4cf5200
121 if (conf == (ngx_msec_t) NGX_CONF_UNSET) { \ 121 if (conf == (ngx_msec_t) NGX_CONF_UNSET) { \
122 conf = (prev == (ngx_msec_t) NGX_CONF_UNSET) ? default : prev; \ 122 conf = (prev == (ngx_msec_t) NGX_CONF_UNSET) ? default : prev; \
123 } 123 }
124 124
125 #define ngx_conf_merge_size_value(conf, prev, default) \ 125 #define ngx_conf_merge_size_value(conf, prev, default) \
126 if (conf == (size_t) NGX_CONF_UNSET) { \ 126 if (conf == (ssize_t) NGX_CONF_UNSET) { \
127 conf = (prev == (size_t) NGX_CONF_UNSET) ? default : prev; \ 127 conf = (prev == (ssize_t) NGX_CONF_UNSET) ? default : prev; \
128 } 128 }
129 129
130 #define ngx_conf_merge_str_value(conf, prev, default) \ 130 #define ngx_conf_merge_str_value(conf, prev, default) \
131 if (conf.len == 0) { \ 131 if (conf.len == 0) { \
132 if (prev.len) { \ 132 if (prev.len) { \