diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2008-07-31 11:55:46 +0400 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2008-07-31 11:55:46 +0400 |
| commit | a3e9f7d306a14bed4dd0f6717b46d8b0e3a0d646 (patch) | |
| tree | d73cffe98b95b0e631544ddbaa7e664b9a1da705 /src | |
| parent | e513a89220d71dc5dcf0ce506722d8247cb6c4d5 (diff) | |
fix conflicting names "true" and "false"
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_script.c | 42 | ||||
| -rw-r--r-- | src/os/unix/ngx_atomic.h | 7 |
2 files changed, 22 insertions, 27 deletions
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c index 0ffa07cc8..95c1cc105 100644 --- 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_script_engine_t *e) 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; diff --git a/src/os/unix/ngx_atomic.h b/src/os/unix/ngx_atomic.h index 22b8b0144..e19fddaca 100644 --- 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 |