diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-12-24 18:01:14 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-12-24 18:01:14 +0300 |
| commit | 77471dbdbb73f637eaa1205b7e1dbdb770ad27f2 (patch) | |
| tree | 74be5a6573bc491c6c0105f4908e035bdd3ae5aa /src | |
| parent | 1c2c11fb6fdf408754df3044ce2306ce2eea9e16 (diff) | |
| download | nginx-77471dbdbb73f637eaa1205b7e1dbdb770ad27f2.tar.gz nginx-77471dbdbb73f637eaa1205b7e1dbdb770ad27f2.zip | |
Win32: compatiblity with OpenSSL 1.1.0.
OpenSSL 1.1.0 now uses normal "nmake; nmake install" instead of using
custom "ms\do_ms.bat" script and "ms\nt.mak" makefile. And Configure
now requires --prefix to be absolute, and no longer derives --openssldir
from prefix (so it's specified explicitly). Generated libraries are now
called "libcrypto.lib" and "libssl.lib" instead of "libeay32.lib"
and "ssleay32.lib". Appropriate tests added to support both old and new
variants.
Additionally, openssl/lhash.h now triggers warning C4090 ('function' :
different 'const' qualifiers), so the warning was disabled.
Diffstat (limited to 'src')
| -rw-r--r-- | src/os/win32/ngx_win32_config.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/os/win32/ngx_win32_config.h b/src/os/win32/ngx_win32_config.h index 3897730a1..4824d05a8 100644 --- a/src/os/win32/ngx_win32_config.h +++ b/src/os/win32/ngx_win32_config.h @@ -88,6 +88,9 @@ typedef long time_t; /* 'type cast': from data pointer to function pointer */ #pragma warning(disable:4055) +/* 'function' : different 'const' qualifiers */ +#pragma warning(disable:4090) + /* unreferenced formal parameter */ #pragma warning(disable:4100) |