Mercurial > hg > nginx
changeset 5358:670ceaba03d8
Win32: Open Watcom C compatibility fixes.
Precompiled headers are disabled as they lead to internal compiler errors
with long configure lines. Couple of false positive warnings silenced.
Various win32 typedefs are adjusted to work with Open Watcom C 1.9 headers.
With this patch, it's now again possible to compile nginx using owc386,
with options we normally compile on win32 minus ipv6 and ssl.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Wed, 04 Sep 2013 20:48:22 +0400 |
parents | 659464c695b7 |
children | 2fda9065d0f4 |
files | auto/cc/owc auto/lib/pcre/makefile.owc src/core/ngx_string.c src/http/modules/ngx_http_mp4_module.c src/os/win32/ngx_win32_config.h |
diffstat | 5 files changed, 21 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/auto/cc/owc Mon Sep 02 20:06:03 2013 +0400 +++ b/auto/cc/owc Wed Sep 04 20:48:22 2013 +0400 @@ -65,10 +65,10 @@ # the precompiled headers -CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch" -NGX_PCH="$NGX_OBJS/ngx_config.pch" -NGX_BUILD_PCH="-fhq=$NGX_OBJS/ngx_config.pch" -NGX_USE_PCH="-fh=$NGX_OBJS/ngx_config.pch" +#CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch" +#NGX_PCH="$NGX_OBJS/ngx_config.pch" +#NGX_BUILD_PCH="-fhq=$NGX_OBJS/ngx_config.pch" +#NGX_USE_PCH="-fh=$NGX_OBJS/ngx_config.pch" # the link flags, built target is NT GUI mode application
--- a/auto/lib/pcre/makefile.owc Mon Sep 02 20:06:03 2013 +0400 +++ b/auto/lib/pcre/makefile.owc Wed Sep 04 20:48:22 2013 +0400 @@ -4,7 +4,7 @@ CFLAGS = -c -zq -bt=nt -ot -op -oi -oe -s -bm $(CPU_OPT) -PCREFLAGS = -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 \ +PCREFLAGS = -DHAVE_CONFIG_H -DPCRE_STATIC -DPOSIX_MALLOC_THRESHOLD=10 & -DSUPPORT_PCRE8 -DHAVE_MEMMOVE
--- a/src/core/ngx_string.c Mon Sep 02 20:06:03 2013 +0400 +++ b/src/core/ngx_string.c Wed Sep 04 20:48:22 2013 +0400 @@ -486,7 +486,7 @@ if (hexadecimal == 0) { - if (ui64 <= NGX_MAX_UINT32_VALUE) { + if (ui64 <= (uint64_t) NGX_MAX_UINT32_VALUE) { /* * To divide 64-bit numbers and to find remainders
--- a/src/http/modules/ngx_http_mp4_module.c Mon Sep 02 20:06:03 2013 +0400 +++ b/src/http/modules/ngx_http_mp4_module.c Wed Sep 04 20:48:22 2013 +0400 @@ -1129,7 +1129,7 @@ atom_header = mp4->mdat_atom_header; - if ((uint64_t) atom_data_size > 0xffffffff) { + if ((uint64_t) atom_data_size > (uint64_t) 0xffffffff) { atom_size = 1; atom_header_size = sizeof(ngx_mp4_atom_header64_t); ngx_mp4_set_64value(atom_header + sizeof(ngx_mp4_atom_header_t),
--- a/src/os/win32/ngx_win32_config.h Mon Sep 02 20:06:03 2013 +0400 +++ b/src/os/win32/ngx_win32_config.h Wed Sep 04 20:48:22 2013 +0400 @@ -128,13 +128,27 @@ typedef __int64 int64_t; typedef unsigned __int64 uint64_t; + +#ifndef __WATCOMC__ typedef int intptr_t; typedef u_int uintptr_t; +#endif + /* Windows defines off_t as long, which is 32-bit */ typedef __int64 off_t; #define _OFF_T_DEFINED +#ifdef __WATCOMC__ + +/* off_t is redefined by sys/types.h used by zlib.h */ +#define __TYPES_H_INCLUDED +typedef int dev_t; +typedef unsigned int ino_t; + +#endif + + typedef int ssize_t; typedef uint32_t in_addr_t; typedef u_short in_port_t;