summaryrefslogtreecommitdiffhomepage
path: root/src/os/win32
diff options
context:
space:
mode:
Diffstat (limited to 'src/os/win32')
-rw-r--r--src/os/win32/ngx_file.h4
-rw-r--r--src/os/win32/ngx_socket.h8
-rw-r--r--src/os/win32/ngx_types.h2
3 files changed, 9 insertions, 5 deletions
diff --git a/src/os/win32/ngx_file.h b/src/os/win32/ngx_file.h
index cae823f5e..aaae84bf6 100644
--- a/src/os/win32/ngx_file.h
+++ b/src/os/win32/ngx_file.h
@@ -10,7 +10,9 @@
#define INVALID_FILE_ATTRIBUTES 0xFFFFFFFF
#endif
-typedef HANDLE ngx_file_t;
+typedef HANDLE ngx_fd_t;
+typedef unsigned __int64 off_t;
+
typedef BY_HANDLE_FILE_INFORMATION ngx_file_info_t;
diff --git a/src/os/win32/ngx_socket.h b/src/os/win32/ngx_socket.h
index 7002795a7..2708b5f2f 100644
--- a/src/os/win32/ngx_socket.h
+++ b/src/os/win32/ngx_socket.h
@@ -9,11 +9,15 @@ typedef SOCKET ngx_socket_t;
void ngx_init_sockets(ngx_log_t *log);
+#define ngx_socket(af, type, proto, flags) \
+ WSASocket(af, type, proto, NULL, 0, flags)
+#define ngx_socket_n "WSASocket()"
+
int ngx_nonblocking_n(s);
-#define ngx_nonblocking_n "ioctlsocket (FIONBIO)"
+#define ngx_nonblocking_n "ioctlsocket(FIONBIO)"
#define ngx_close_socket closesocket
-#define ngx_close_socket_n "closesocket"
+#define ngx_close_socket_n "closesocket()"
#endif /* _NGX_SOCKET_H_INCLUDED_ */
diff --git a/src/os/win32/ngx_types.h b/src/os/win32/ngx_types.h
index 6a7587867..fdf6ccd76 100644
--- a/src/os/win32/ngx_types.h
+++ b/src/os/win32/ngx_types.h
@@ -5,9 +5,7 @@
#include <ngx_config.h>
-typedef HANDLE ngx_file_t;
typedef long time_t;
-typedef unsigned __int64 off_t;
#define QD_FMT "%I64d"