aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_conf_file.h
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2004-03-16 07:10:12 +0000
committerIgor Sysoev <igor@sysoev.ru>2004-03-16 07:10:12 +0000
commit10a543a810ac78eb5d754302b001debf9cd420c4 (patch)
treea4a4f43835bed4549007b82db516d460fc86c555 /src/core/ngx_conf_file.h
parent5596ede94ed311bb9d16ee11f6f68c97eb46d836 (diff)
downloadnginx-10a543a810ac78eb5d754302b001debf9cd420c4.tar.gz
nginx-10a543a810ac78eb5d754302b001debf9cd420c4.zip
nginx-0.0.2-2004-03-16-10:10:12 import
Diffstat (limited to 'src/core/ngx_conf_file.h')
-rw-r--r--src/core/ngx_conf_file.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/ngx_conf_file.h b/src/core/ngx_conf_file.h
index 6e81f2b67..8b4aa490e 100644
--- a/src/core/ngx_conf_file.h
+++ b/src/core/ngx_conf_file.h
@@ -43,6 +43,8 @@
#define NGX_CONF_UNSET -1
+#define NGX_CONF_UNSET_SIZE (size_t) -1
+#define NGX_CONF_UNSET_MSEC (ngx_msec_t) -1
#define NGX_CONF_OK NULL
@@ -189,8 +191,8 @@ char *ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data);
}
#define ngx_conf_merge_msec_value(conf, prev, default) \
- if (conf == (ngx_msec_t) NGX_CONF_UNSET) { \
- conf = (prev == (ngx_msec_t) NGX_CONF_UNSET) ? default : prev; \
+ if (conf == NGX_CONF_UNSET_MSEC) { \
+ conf = (prev == NGX_CONF_UNSET_MSEC) ? default : prev; \
}
#define ngx_conf_merge_sec_value(conf, prev, default) \
@@ -199,8 +201,8 @@ char *ngx_conf_check_num_bounds(ngx_conf_t *cf, void *post, void *data);
}
#define ngx_conf_merge_size_value(conf, prev, default) \
- if (conf == (ssize_t) NGX_CONF_UNSET) { \
- conf = (prev == (ssize_t) NGX_CONF_UNSET) ? default : prev; \
+ if (conf == NGX_CONF_UNSET_SIZE) { \
+ conf = (prev == NGX_CONF_UNSET_SIZE) ? default : prev; \
}
#define ngx_conf_merge_str_value(conf, prev, default) \