diff options
| author | Brent Cook <bcook@openbsd.org> | 2018-08-03 22:27:07 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2018-08-03 22:27:07 -0500 |
| commit | 7c5856c28d90a732a95d30db53effac75145dedf (patch) | |
| tree | 2f673d8da14e21f03ddcd37d1b45c3e99a055d30 | |
| parent | 62f96a5d3c6d5438fa9fd3f1022131e2ebdcaecf (diff) | |
| parent | 3e95275de876bdb3e96419010e5129e415bf0770 (diff) | |
| download | portable-7c5856c28d90a732a95d30db53effac75145dedf.tar.gz portable-7c5856c28d90a732a95d30db53effac75145dedf.tar.bz2 portable-7c5856c28d90a732a95d30db53effac75145dedf.zip | |
Land #434, Suppress "overriding WinCrypt defines" warnings
| -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") |