Mercurial > hg > nginx

diff src/core/ngx_conf_file.h @ 1523:b7d39d0b0025 stable-0.5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -257,8 +257,8 @@ char *ngx_conf_check_num_bounds(ngx_conf
     }
 
 #define ngx_conf_merge_ptr_value(conf, prev, default)                        \
-    if (conf == NULL) {                                                      \
-        conf = (prev == NULL) ? default : prev;                              \
+    if (conf == NGX_CONF_UNSET_PTR) {                                        \
+        conf = (prev == NGX_CONF_UNSET_PTR) ? default : prev;                \
     }
 
 #define ngx_conf_merge_uint_value(conf, prev, default)                       \