diff options
| author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2018-07-29 16:17:44 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-29 16:17:44 +0900 |
| commit | 3e95275de876bdb3e96419010e5129e415bf0770 (patch) | |
| tree | 30d15059ba0a2a3df386bddc15cc6dcc8057b9f7 | |
| parent | f30569c005f40b75d8cb524d66673020ef436344 (diff) | |
| download | portable-3e95275de876bdb3e96419010e5129e415bf0770.tar.gz portable-3e95275de876bdb3e96419010e5129e415bf0770.tar.bz2 portable-3e95275de876bdb3e96419010e5129e415bf0770.zip | |
Suppress "overriding WinCrypt defines" warnings
Suppress "overriding WinCrypt defines" from openssl/x509.h by defining `NOCRYPT`.
Only this file does not check `__WINCRYPT_H__` macro like other headers, since
https://github.com/libressl-portable/portable/commit/5d8a1cf7155130bd8101090d7e1d0c2f90d9b123#diff-74b6370bc092dd2988ab577b2eaa21dcR7
| -rw-r--r-- | patches/windows_headers.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/windows_headers.patch b/patches/windows_headers.patch index 5d216fb..49e2a97 100644 --- a/patches/windows_headers.patch +++ b/patches/windows_headers.patch | |||
| @@ -81,7 +81,7 @@ diff -u include/openssl.orig/x509.h include/openssl/x509.h | |||
| 81 | extern "C" { | 81 | extern "C" { |
| 82 | #endif | 82 | #endif |
| 83 | 83 | ||
| 84 | +#if defined(_WIN32) | 84 | +#if defined(_WIN32) && defined(__WINCRYPT_H__) |
| 85 | +#ifndef LIBRESSL_INTERNAL | 85 | +#ifndef LIBRESSL_INTERNAL |
| 86 | +#ifdef _MSC_VER | 86 | +#ifdef _MSC_VER |
| 87 | +#pragma message("Warning, overriding WinCrypt defines") | 87 | +#pragma message("Warning, overriding WinCrypt defines") |