aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@ruby-lang.org>2018-07-29 08:13:05 +0000
committerKazuki Yamaguchi <k@rhe.jp>2018-08-08 15:42:48 +0900
commite092ed92cb04980318c229b811d01c346ee44cfb (patch)
treeddaa13a1d6c87afeda86abd90672c2282880ca58
parenta597d2bc91ae263d67971f7a6a3051db91c23ba3 (diff)
downloadruby-openssl-e092ed92cb04980318c229b811d01c346ee44cfb.tar.gz
reduce LibreSSL warnings
* ext/openssl/extconf.rb: LibreSSL headers emit "overriding WinCrypt defines" warnings if wincrypt.h has been included (except for x509.h) on Windows. get rid of including the header by defining NOCRYPT macro. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64101 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Sync-with-trunk: r64101
-rw-r--r--ext/openssl/extconf.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index e741b5a7..b5252f12 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -125,6 +125,10 @@ engines.each { |name|
OpenSSL.check_func_or_macro("ENGINE_load_#{name}", "openssl/engine.h")
}
+if ($mswin || $mingw) && have_macro("LIBRESSL_VERSION_NUMBER")
+ $defs.push("-DNOCRYPT")
+end
+
# added in 0.9.8X
have_func("EVP_CIPHER_CTX_new")
have_func("EVP_CIPHER_CTX_free")