From 07eb7bec1f2c2d440fc87d89c09681e5b6939f94 Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Tue, 1 Nov 2011 13:56:26 +0000 Subject: Merging r4155, r4219, r4220, r4230: Windows related fixes: *) Fixed segmentation fault with empty config on Windows. See here for report: http://mailman.nginx.org/pipermail/nginx-ru/2011-September/043288.html *) Recent SDKs allow to build IPV6 only for Windows XP or above. *) Fixing conflict with SDK off_t definition. *) Fix of building by Microsoft Visual C++ 10 compiler. --- src/os/win32/ngx_win32_config.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/os') diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index f098eae36..8ffe95c31 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -9,7 +9,7 @@ #define WIN32 0x0400 -#define _WIN32_WINNT 0x0500 +#define _WIN32_WINNT 0x0501 #define STRICT @@ -126,8 +126,11 @@ typedef unsigned __int64 uint64_t; typedef int intptr_t; typedef u_int uintptr_t; -typedef int ssize_t; +/* Windows defines off_t as long, which is 32-bit */ typedef __int64 off_t; +#define _OFF_T_DEFINED + +typedef int ssize_t; typedef uint32_t in_addr_t; typedef u_short in_port_t; typedef int sig_atomic_t; -- cgit