Mercurial > hg > nginx

changeset 4219:691133126226

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing conflict with SDK off_t definition.
author Igor Sysoev <igor@sysoev.ru>
date Thu, 20 Oct 2011 07:12:45 +0000
parents a10354495767
children 4be8dd8dd547
files src/os/win32/ngx_win32_config.h
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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;
 
+/* Windows defines off_t as long, which is 32-bit */
+typedef __int64             off_t;
+#define _OFF_T_DEFINED
+
 typedef int                 ssize_t;
-typedef __int64             off_t;
 typedef uint32_t            in_addr_t;
 typedef u_short             in_port_t;
 typedef int                 sig_atomic_t;