[前][次][番号順一覧][スレッド一覧]

ruby-changes:51887

From: nobu <ko1@a...>
Date: Sun, 29 Jul 2018 17:13:12 +0900 (JST)
Subject: [ruby-changes:51887] nobu:r64101 (trunk): reduce LibreSSL warnings

nobu	2018-07-29 17:13:05 +0900 (Sun, 29 Jul 2018)

  New Revision: 64101

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64101

  Log:
    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.

  Modified files:
    trunk/ext/openssl/extconf.rb
Index: ext/openssl/extconf.rb
===================================================================
--- ext/openssl/extconf.rb	(revision 64100)
+++ ext/openssl/extconf.rb	(revision 64101)
@@ -114,6 +114,10 @@ engines.each { |name| https://github.com/ruby/ruby/blob/trunk/ext/openssl/extconf.rb#L114
   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 1.0.2
 have_func("EC_curve_nist2nid")
 have_func("X509_REVOKED_dup")

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]