diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2004-03-05 08:34:24 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2004-03-05 08:34:24 +0000 |
| commit | ab9d5fdfd55c879611d69998fc58cbb39f25e73a (patch) | |
| tree | 90ff43013ac4579f2c4ba1a42b8777bfa4fecaaa /src/event | |
| parent | 6a9304522227d4b4df873d3716cf06093d497700 (diff) | |
| download | nginx-ab9d5fdfd55c879611d69998fc58cbb39f25e73a.tar.gz nginx-ab9d5fdfd55c879611d69998fc58cbb39f25e73a.tar.bz2 | |
nginx-0.0.2-2004-03-05-11:34:24 import
Diffstat (limited to 'src/event')
| -rw-r--r-- | src/event/modules/ngx_iocp_module.c | 2 | ||||
| -rw-r--r-- | src/event/ngx_event.h | 4 | ||||
| -rw-r--r-- | src/event/ngx_event_acceptex.c | 4 |
3 files changed, 6 insertions, 4 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; |