comparison src/os/win32/ngx_win32_config.h @ 461:a88a3e4e158f release-0.1.5

nginx-0.1.5-RELEASE import *) Bugfix: on Solaris and Linux there may be too many "recvmsg() returned not enough data" alerts. *) Bugfix: there were the "writev() failed (22: Invalid argument)" errors on Solaris in proxy mode without sendfile. On other platforms that do not support sendfile at all the process got caught in an endless loop. *) Bugfix: segmentation fault on Solaris in proxy mode and using sendfile. *) Bugfix: segmentation fault on Solaris. *) Bugfix: on-line upgrade did not work on Linux. *) Bugfix: the ngx_http_autoindex_module module did not escape the spaces, the quotes, and the percent signs in the directory listing. *) Change: the decrease of the copy operations. *) Feature: the userid_p3p directive.
author Igor Sysoev <igor@sysoev.ru>
date Thu, 11 Nov 2004 14:07:14 +0000
parents 295d97d70c69
children 2ff194b74f1e
comparison
equal deleted inserted replaced
460:5f8319142dfc 461:a88a3e4e158f
5 5
6 6
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
11 #define WIN32 1
12 10
13 #define STRICT 11 #define STRICT
14 #define WIN32_LEAN_AND_MEAN 12 #define WIN32_LEAN_AND_MEAN
15 13
16 /* 14 /*
23 #pragma warning(disable:4201) 21 #pragma warning(disable:4201)
24 #endif 22 #endif
25 23
26 #include <winsock2.h> 24 #include <winsock2.h>
27 #include <mswsock.h> 25 #include <mswsock.h>
26 #include <shellapi.h>
28 #include <stddef.h> /* offsetof() */ 27 #include <stddef.h> /* offsetof() */
29 #include <stdio.h> 28 #include <stdio.h>
30 #include <stdlib.h> 29 #include <stdlib.h>
31 #include <stdarg.h> 30 #include <stdarg.h>
32 31
94 #define ngx_inline __inline 93 #define ngx_inline __inline
95 94
96 95
97 #ifdef _MSC_VER 96 #ifdef _MSC_VER
98 typedef unsigned __int32 uint32_t; 97 typedef unsigned __int32 uint32_t;
98 typedef __int32 int32_t;
99 #else /* __WATCOMC__ */ 99 #else /* __WATCOMC__ */
100 typedef unsigned int uint32_t; 100 typedef unsigned int uint32_t;
101 typedef int int32_t;
101 #endif 102 #endif
102 103
103 typedef __int64 int64_t; 104 typedef __int64 int64_t;
104 typedef unsigned __int64 uint64_t; 105 typedef unsigned __int64 uint64_t;
105 typedef u_int uintptr_t; 106 typedef u_int uintptr_t;
113 typedef uint32_t ngx_atomic_t; 114 typedef uint32_t ngx_atomic_t;
114 115
115 116
116 #define TIME_T_LEN sizeof("-2147483648") - 1 117 #define TIME_T_LEN sizeof("-2147483648") - 1
117 118
118 #define OFF_T_FMT "%I64d" 119
119 #define SIZE_T_FMT "%d" 120 #define NGX_WIN_NT 200000
120 #define SIZE_T_X_FMT "%x"
121 #define PID_T_FMT "%d"
122 #define TIME_T_FMT "%lu"
123 #define PTR_FMT "%08X"
124 121
125 122
126 #define NGX_WIN_NT 200000 123 #define NGX_THREADS 1
127 124
128 125
129 #ifndef HAVE_INHERITED_NONBLOCK 126 #ifndef HAVE_INHERITED_NONBLOCK
130 #define HAVE_INHERITED_NONBLOCK 1 127 #define HAVE_INHERITED_NONBLOCK 1
131 #endif 128 #endif