Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src/os
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/os
parentc17009ee756bf16e702ed48ef667765c121e36d6 (diff)
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/os')
-rw-r--r--src/os/win32/ngx_win32_config.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index c5e26dcbd..3897730a1 100644
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -94,6 +94,12 @@ typedef long time_t;
/* FD_SET() and FD_CLR(): conditional expression is constant */
#pragma warning(disable:4127)
+/* conversion from 'type1' to 'type2', possible loss of data */
+#pragma warning(disable:4244)
+
+/* conversion from 'size_t' to 'type', possible loss of data */
+#pragma warning(disable:4267)
+
/* array is too small to include a terminating null character */
#pragma warning(disable:4295)
@@ -189,8 +195,12 @@ typedef unsigned int ino_t;
#ifndef __GNUC__
+#ifdef _WIN64
+typedef __int64 ssize_t;
+#else
typedef int ssize_t;
#endif
+#endif
typedef uint32_t in_addr_t;