Mercurial > hg > nginx
comparison src/os/win32/ngx_win32_config.h @ 4249:e648bb470e12 stable-1.0
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.
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Tue, 01 Nov 2011 13:56:26 +0000 |
parents | 4f021d4ceb88 |
children | 4919fb357a5d |
comparison
equal
deleted
inserted
replaced
4248:2fad4d19ea4b | 4249:e648bb470e12 |
---|---|
7 #ifndef _NGX_WIN32_CONFIG_H_INCLUDED_ | 7 #ifndef _NGX_WIN32_CONFIG_H_INCLUDED_ |
8 #define _NGX_WIN32_CONFIG_H_INCLUDED_ | 8 #define _NGX_WIN32_CONFIG_H_INCLUDED_ |
9 | 9 |
10 | 10 |
11 #define WIN32 0x0400 | 11 #define WIN32 0x0400 |
12 #define _WIN32_WINNT 0x0500 | 12 #define _WIN32_WINNT 0x0501 |
13 | 13 |
14 | 14 |
15 #define STRICT | 15 #define STRICT |
16 #define WIN32_LEAN_AND_MEAN | 16 #define WIN32_LEAN_AND_MEAN |
17 | 17 |
124 typedef __int64 int64_t; | 124 typedef __int64 int64_t; |
125 typedef unsigned __int64 uint64_t; | 125 typedef unsigned __int64 uint64_t; |
126 typedef int intptr_t; | 126 typedef int intptr_t; |
127 typedef u_int uintptr_t; | 127 typedef u_int uintptr_t; |
128 | 128 |
129 /* Windows defines off_t as long, which is 32-bit */ | |
130 typedef __int64 off_t; | |
131 #define _OFF_T_DEFINED | |
132 | |
129 typedef int ssize_t; | 133 typedef int ssize_t; |
130 typedef __int64 off_t; | |
131 typedef uint32_t in_addr_t; | 134 typedef uint32_t in_addr_t; |
132 typedef u_short in_port_t; | 135 typedef u_short in_port_t; |
133 typedef int sig_atomic_t; | 136 typedef int sig_atomic_t; |
134 | 137 |
135 | 138 |