diff options
Diffstat (limited to '')
| -rw-r--r-- | src/os/win32/ngx_sendfile.c | 2 | ||||
| -rw-r--r-- | src/os/win32/ngx_win32_config.h | 17 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/os/win32/ngx_sendfile.c b/src/os/win32/ngx_sendfile.c index c2bdf6c62..2dd779d19 100644 --- a/src/os/win32/ngx_sendfile.c +++ b/src/os/win32/ngx_sendfile.c @@ -42,7 +42,7 @@ int ngx_sendfile(ngx_connection_t *c, if (ev->ready) { ev->ready = 0; -#if (HAVE_IOCP_EVENT) /* iocp */ +#if (HAVE_IOCP) /* iocp */ if (ngx_event_flags & NGX_HAVE_IOCP_EVENT) { if (ev->ovlp.error) { diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index defddab94..7b1fd130b 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -21,7 +21,7 @@ #include <winsock2.h> #include <mswsock.h> -#include <stddef.h> /* offsetof */ +#include <stddef.h> /* offsetof() */ #include <stdio.h> #include <stdlib.h> #include <stdarg.h> @@ -41,6 +41,7 @@ #if 0 +/* owc have not __int32 */ typedef unsigned __int32 uint32_t; #else typedef unsigned int uint32_t; @@ -52,18 +53,16 @@ typedef u_int uintptr_t; typedef int ssize_t; typedef long time_t; typedef __int64 off_t; +typedef uint32_t in_addr_t; -#define OFF_FMT "%I64d" -#define SIZE_FMT "%d" -#define SIZEX_FMT "%x" -#define PID_FMT "%d" -#define TIME_FMT "%lu" +#define OFF_T_FMT "%I64d" +#define SIZE_T_FMT "%d" +#define SIZE_T_X_FMT "%x" +#define PID_T_FMT "%d" +#define TIME_T_FMT "%lu" -/* STUB */ -typedef uint32_t u_int32_t; - #ifndef HAVE_INHERITED_NONBLOCK #define HAVE_INHERITED_NONBLOCK 1 |