aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2011-10-20 07:12:45 +0000
committerIgor Sysoev <igor@sysoev.ru>2011-10-20 07:12:45 +0000
commit5f810705232f477361de76521287614562c34592 (patch)
tree474f8e93cbbfd2f5e8c79ddf0ee04bb9465f6dc3 /src
parent1472e7964bb308275945ca6cfe13a1fc4916a0b5 (diff)
downloadnginx-5f810705232f477361de76521287614562c34592.tar.gz
nginx-5f810705232f477361de76521287614562c34592.zip
Fixing conflict with SDK off_t definition.
Diffstat (limited to 'src')
-rw-r--r--src/os/win32/ngx_win32_config.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h
index cc4c375eb..8ffe95c31 100644
--- a/src/os/win32/ngx_win32_config.h
+++ b/src/os/win32/ngx_win32_config.h
@@ -126,8 +126,11 @@ typedef unsigned __int64 uint64_t;
typedef int intptr_t;
typedef u_int uintptr_t;
-typedef int ssize_t;
+/* Windows defines off_t as long, which is 32-bit */
typedef __int64 off_t;
+#define _OFF_T_DEFINED
+
+typedef int ssize_t;
typedef uint32_t in_addr_t;
typedef u_short in_port_t;
typedef int sig_atomic_t;