Mercurial > hg > nginx
changeset 2133:c505e2712e13
fix conflicting names "true" and "false"
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Thu, 31 Jul 2008 07:55:46 +0000 |
| parents | 6a0eb17fa027 |
| children | 13652cba8633 |
| files | src/http/ngx_http_script.c src/os/unix/ngx_atomic.h |
| diffstat | 2 files changed, 22 insertions(+), 27 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_script.c +++ b/src/http/ngx_http_script.c @@ -1016,69 +1016,69 @@ ngx_http_script_file_code(ngx_http_scrip case ngx_http_script_file_dir: case ngx_http_script_file_exists: case ngx_http_script_file_exec: - goto false; + goto false_value; case ngx_http_script_file_not_plain: case ngx_http_script_file_not_dir: case ngx_http_script_file_not_exists: case ngx_http_script_file_not_exec: - goto true; + goto true_value; } - goto false; + goto false_value; } switch (code->op) { case ngx_http_script_file_plain: if (of.is_file) { - goto true; + goto true_value; } - goto false; + goto false_value; case ngx_http_script_file_not_plain: if (of.is_file) { - goto false; + goto false_value; } - goto true; + goto true_value; case ngx_http_script_file_dir: if (of.is_dir) { - goto true; + goto true_value; } - goto false; + goto false_value; case ngx_http_script_file_not_dir: if (of.is_dir) { - goto false; + goto false_value; } - goto true; + goto true_value; case ngx_http_script_file_exists: if (of.is_file || of.is_dir || of.is_link) { - goto true; + goto true_value; } - goto false; + goto false_value; case ngx_http_script_file_not_exists: if (of.is_file || of.is_dir || of.is_link) { - goto false; + goto false_value; } - goto true; + goto true_value; case ngx_http_script_file_exec: if (of.is_exec) { - goto true; + goto true_value; } - goto false; + goto false_value; case ngx_http_script_file_not_exec: if (of.is_exec) { - goto false; + goto false_value; } - goto true; + goto true_value; } -false: +false_value: ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, "http script file op false"); @@ -1086,7 +1086,7 @@ false: *value = ngx_http_variable_null_value; return; -true: +true_value: *value = ngx_http_variable_true_value; return;
--- a/src/os/unix/ngx_atomic.h +++ b/src/os/unix/ngx_atomic.h @@ -21,13 +21,8 @@ #include <libkern/OSAtomic.h> -/* "bool" conflicts with perl's CORE/handy.h - * "true" and "false" conflict with nginx, and of course we can rename them, - * but we need to undef "bool" anyway - */ +/* "bool" conflicts with perl's CORE/handy.h */ #undef bool -#undef true -#undef false #define NGX_HAVE_ATOMIC_OPS 1