Mercurial > hg > nginx
comparison src/os/win32/ngx_win32_config.h @ 6862:abb0a4189cf7
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.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sat, 24 Dec 2016 18:01:14 +0300 |
| parents | e4590dfd97ff |
| children | efd71d49bde0 |
comparison
equal
deleted
inserted
replaced
| 6861:e4590dfd97ff | 6862:abb0a4189cf7 |
|---|---|
| 85 /* 'type cast': from function pointer to data pointer */ | 85 /* 'type cast': from function pointer to data pointer */ |
| 86 #pragma warning(disable:4054) | 86 #pragma warning(disable:4054) |
| 87 | 87 |
| 88 /* 'type cast': from data pointer to function pointer */ | 88 /* 'type cast': from data pointer to function pointer */ |
| 89 #pragma warning(disable:4055) | 89 #pragma warning(disable:4055) |
| 90 | |
| 91 /* 'function' : different 'const' qualifiers */ | |
| 92 #pragma warning(disable:4090) | |
| 90 | 93 |
| 91 /* unreferenced formal parameter */ | 94 /* unreferenced formal parameter */ |
| 92 #pragma warning(disable:4100) | 95 #pragma warning(disable:4100) |
| 93 | 96 |
| 94 /* FD_SET() and FD_CLR(): conditional expression is constant */ | 97 /* FD_SET() and FD_CLR(): conditional expression is constant */ |