aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http_script.c
diff options
context:
space:
mode:
authorMaxim Dounin <mdounin@mdounin.ru>2016-12-24 18:01:14 +0300
committerMaxim Dounin <mdounin@mdounin.ru>2016-12-24 18:01:14 +0300
commit1c2c11fb6fdf408754df3044ce2306ce2eea9e16 (patch)
tree9e74cad1d1cdaaaddf977c618865f558ab35e87c /src/http/ngx_http_script.c
parentc17009ee756bf16e702ed48ef667765c121e36d6 (diff)
downloadnginx-1c2c11fb6fdf408754df3044ce2306ce2eea9e16.tar.gz
nginx-1c2c11fb6fdf408754df3044ce2306ce2eea9e16.zip
Win32: support 64-bit compilation with MSVC.
There are lots of C4244 warnings (conversion from 'type1' to 'type2', possible loss of data), so they were disabled. The same applies to C4267 warnings (conversion from 'size_t' to 'type', possible loss of data), most notably - conversion from ngx_str_t.len to ngx_variable_value_t.len (which is unsigned:28). Additionally, there is at least one case when it is not possible to fix the warning properly without introducing win32-specific code: recv() on win32 uses "int len", while POSIX defines "size_t len". The ssize_t type now properly defined for 64-bit compilation with MSVC. Caught by warning C4305 (truncation from '__int64' to 'ssize_t'), on "cutoff = NGX_MAX_SIZE_T_VALUE / 10" in ngx_atosz()). Several C4334 warnings (result of 32-bit shift implicitly converted to 64 bits) were fixed by adding explicit conversions. Several C4214 warnings (nonstandard extension used: bit field types other than int) in ngx_http_script.h fixed by changing bit field types from uintptr_t to unsigned.
Diffstat (limited to 'src/http/ngx_http_script.c')
-rw-r--r--src/http/ngx_http_script.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index c2b165801..c1a0b4c56 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -356,11 +356,11 @@ ngx_http_script_compile(ngx_http_script_compile_t *sc)
n = sc->source->data[i] - '0';
- if (sc->captures_mask & (1 << n)) {
+ if (sc->captures_mask & ((ngx_uint_t) 1 << n)) {
sc->dup_capture = 1;
}
- sc->captures_mask |= 1 << n;
+ sc->captures_mask |= (ngx_uint_t) 1 << n;
if (ngx_http_script_add_capture_code(sc, n) != NGX_OK) {
return NGX_ERROR;