diff options
Diffstat (limited to 'src/os/win32')
| -rw-r--r-- | src/os/win32/ngx_files.c | 4 | ||||
| -rw-r--r-- | src/os/win32/ngx_process.c | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_config.h | 15 | ||||
| -rw-r--r-- | src/os/win32/ngx_wsarecv.c | 6 | ||||
| -rw-r--r-- | src/os/win32/ngx_wsarecv_chain.c | 4 | ||||
| -rw-r--r-- | src/os/win32/ngx_wsasend_chain.c | 6 |
6 files changed, 26 insertions, 11 deletions
diff --git a/src/os/win32/ngx_files.c b/src/os/win32/ngx_files.c index 3906ddc49..df0d865c1 100644 --- a/src/os/win32/ngx_files.c +++ b/src/os/win32/ngx_files.c @@ -5,8 +5,8 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset) { - size_t n; long high_offset; + DWORD n; ngx_err_t err; OVERLAPPED ovlp, *povlp; @@ -67,8 +67,8 @@ ssize_t ngx_read_file(ngx_file_t *file, char *buf, size_t size, off_t offset) ssize_t ngx_write_file(ngx_file_t *file, char *buf, size_t size, off_t offset) { - size_t n; long high_offset; + DWORD n; ngx_err_t err; OVERLAPPED ovlp, *povlp; diff --git a/src/os/win32/ngx_process.c b/src/os/win32/ngx_process.c index e3a278647..6d78c1c13 100644 --- a/src/os/win32/ngx_process.c +++ b/src/os/win32/ngx_process.c @@ -3,7 +3,7 @@ #include <ngx_core.h> -ngx_pid_t ngx_exec(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx) +ngx_pid_t ngx_execute(ngx_cycle_t *cycle, ngx_exec_ctx_t *ctx) { return /* STUB */ 0; } diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index 2af600d5e..b1d7d5781 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -7,6 +7,10 @@ #define STRICT #define WIN32_LEAN_AND_MEAN +#ifdef __WATCOMC__ +#pragma disable_message(107) +#endif + /* * we need to include windows.h explicity before winsock2.h because * warning 4201 is enabled in windows.h @@ -34,6 +38,17 @@ #pragma warning(disable:4127) #endif + +#ifdef __WATCOMC__ +#pragma enable_message(107) +#if 0 +/* Symbol 'ngx_rbtree_min' has been defined, but not referenced */ +#pragma disable_message(202) +#endif +/* No prototype found for 'stricmp' */ +#pragma disable_message(301) +#endif + #include <ngx_auto_config.h> diff --git a/src/os/win32/ngx_wsarecv.c b/src/os/win32/ngx_wsarecv.c index 96fa0ff4c..2de1110c0 100644 --- a/src/os/win32/ngx_wsarecv.c +++ b/src/os/win32/ngx_wsarecv.c @@ -7,8 +7,7 @@ ssize_t ngx_wsarecv(ngx_connection_t *c, char *buf, size_t size) { int rc; - u_int flags; - size_t bytes; + u_long bytes, flags; WSABUF wsabuf[1]; ngx_err_t err; ngx_event_t *rev; @@ -56,8 +55,7 @@ ssize_t ngx_wsarecv(ngx_connection_t *c, char *buf, size_t size) ssize_t ngx_overlapped_wsarecv(ngx_connection_t *c, char *buf, size_t size) { int rc; - u_int flags; - size_t bytes; + u_long bytes, flags; WSABUF wsabuf[1]; ngx_err_t err; ngx_event_t *rev; diff --git a/src/os/win32/ngx_wsarecv_chain.c b/src/os/win32/ngx_wsarecv_chain.c index afdfa05c0..4bdc5d6d8 100644 --- a/src/os/win32/ngx_wsarecv_chain.c +++ b/src/os/win32/ngx_wsarecv_chain.c @@ -8,8 +8,8 @@ ssize_t ngx_wsarecv_chain(ngx_connection_t *c, ngx_chain_t *chain) { int rc; char *prev; - u_int flags; - size_t bytes, size; + u_long bytes, flags; + size_t size; WSABUF *wsabuf; ngx_err_t err; ngx_array_t io; diff --git a/src/os/win32/ngx_wsasend_chain.c b/src/os/win32/ngx_wsasend_chain.c index a52296a09..9d1812d4b 100644 --- a/src/os/win32/ngx_wsasend_chain.c +++ b/src/os/win32/ngx_wsasend_chain.c @@ -8,7 +8,8 @@ ngx_chain_t *ngx_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in) { int rc; char *prev; - size_t size, sent; + size_t size; + u_long sent; LPWSABUF wsabuf; ngx_err_t err; ngx_event_t *wev; @@ -102,7 +103,8 @@ ngx_chain_t *ngx_overlapped_wsasend_chain(ngx_connection_t *c, ngx_chain_t *in) { int rc; char *prev; - size_t size, sent; + size_t size; + u_long sent; LPWSABUF wsabuf; ngx_err_t err; ngx_event_t *wev; |