Mercurial > hg > nginx

comparison src/http/ngx_http_script.h @ 6861:e4590dfd97ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Maxim Dounin <mdounin@mdounin.ru>
date Sat, 24 Dec 2016 18:01:14 +0300
parents d620f497c50f
children 5efc23d83bc2
comparison
equal deleted inserted replaced
6860:f18c285c2e59 6861:e4590dfd97ff
119 ngx_array_t *lengths; 119 ngx_array_t *lengths;
120 uintptr_t size; 120 uintptr_t size;
121 uintptr_t status; 121 uintptr_t status;
122 uintptr_t next; 122 uintptr_t next;
123 123
124 uintptr_t test:1; 124 unsigned test:1;
125 uintptr_t negative_test:1; 125 unsigned negative_test:1;
126 uintptr_t uri:1; 126 unsigned uri:1;
127 uintptr_t args:1; 127 unsigned args:1;
128 128
129 /* add the r->args to the new arguments */ 129 /* add the r->args to the new arguments */
130 uintptr_t add_args:1; 130 unsigned add_args:1;
131 131
132 uintptr_t redirect:1; 132 unsigned redirect:1;
133 uintptr_t break_cycle:1; 133 unsigned break_cycle:1;
134 134
135 ngx_str_t name; 135 ngx_str_t name;
136 } ngx_http_script_regex_code_t; 136 } ngx_http_script_regex_code_t;
137 137
138 138
139 typedef struct { 139 typedef struct {
140 ngx_http_script_code_pt code; 140 ngx_http_script_code_pt code;
141 141
142 uintptr_t uri:1; 142 unsigned uri:1;
143 uintptr_t args:1; 143 unsigned args:1;
144 144
145 /* add the r->args to the new arguments */ 145 /* add the r->args to the new arguments */
146 uintptr_t add_args:1; 146 unsigned add_args:1;
147 147
148 uintptr_t redirect:1; 148 unsigned redirect:1;
149 } ngx_http_script_regex_end_code_t; 149 } ngx_http_script_regex_end_code_t;
150 150
151 #endif 151 #endif
152 152
153 153