From 3e95275de876bdb3e96419010e5129e415bf0770 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sun, 29 Jul 2018 16:17:44 +0900 Subject: 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 --- patches/windows_headers.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 extern "C" { #endif -+#if defined(_WIN32) ++#if defined(_WIN32) && defined(__WINCRYPT_H__) +#ifndef LIBRESSL_INTERNAL +#ifdef _MSC_VER +#pragma message("Warning, overriding WinCrypt defines") -- cgit v1.2.3-55-g6feb