aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/event/modules/ngx_iocp_module.c2
-rw-r--r--src/event/ngx_event.h4
-rw-r--r--src/event/ngx_event_acceptex.c4
-rw-r--r--src/http/ngx_http_log_handler.c2
-rw-r--r--src/os/win32/ngx_files.c4
-rw-r--r--src/os/win32/ngx_process.c2
-rw-r--r--src/os/win32/ngx_win32_config.h15
-rw-r--r--src/os/win32/ngx_wsarecv.c6
-rw-r--r--src/os/win32/ngx_wsarecv_chain.c4
-rw-r--r--src/os/win32/ngx_wsasend_chain.c6
10 files changed, 33 insertions, 16 deletions
diff --git a/src/event/modules/ngx_iocp_module.c b/src/event/modules/ngx_iocp_module.c
index 0adc0c74c..e0a042c9c 100644
--- a/src/event/modules/ngx_iocp_module.c
+++ b/src/event/modules/ngx_iocp_module.c
@@ -164,7 +164,7 @@ static ngx_int_t ngx_iocp_process_events(ngx_log_t *log)
{
int rc;
u_int key;
- size_t bytes;
+ u_long bytes;
ngx_err_t err;
ngx_msec_t timer;
ngx_event_t *ev;
diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
index 71fa5d47d..8ca468efa 100644
--- a/src/event/ngx_event.h
+++ b/src/event/ngx_event.h
@@ -122,11 +122,13 @@ struct ngx_event_s {
* write: available space in buffer when event is ready
* or lowat when event is set with NGX_LOWAT_EVENT flag
*
+ * iocp: TODO
+ *
* otherwise:
* accept: 1 if accept many, 0 otherwise
*/
-#if (HAVE_KQUEUE)
+#if (HAVE_KQUEUE) || (HAVE_IOCP)
int available;
#else
unsigned short available:1;
diff --git a/src/event/ngx_event_acceptex.c b/src/event/ngx_event_acceptex.c
index 164db0ed4..7923a022b 100644
--- a/src/event/ngx_event_acceptex.c
+++ b/src/event/ngx_event_acceptex.c
@@ -58,8 +58,8 @@ void ngx_event_acceptex(ngx_event_t *rev)
int ngx_event_post_acceptex(ngx_listening_t *ls, int n)
{
- int i;
- u_int rcvd;
+ u_long rcvd;
+ ngx_int_t i;
ngx_err_t err;
ngx_event_t *rev, *wev;
ngx_socket_t s;
diff --git a/src/http/ngx_http_log_handler.c b/src/http/ngx_http_log_handler.c
index 8b4c76358..b34bd1bf2 100644
--- a/src/http/ngx_http_log_handler.c
+++ b/src/http/ngx_http_log_handler.c
@@ -129,7 +129,7 @@ int ngx_http_log_handler(ngx_http_request_t *r)
ngx_http_log_op_t *op;
ngx_http_log_loc_conf_t *lcf;
#if (WIN32)
- u_int written;
+ u_long written;
#endif
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-21 13:15:14 +0000