naruse	2015-11-21 13:06:43 +0900 (Sat, 21 Nov 2015)

  New Revision: 52693

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

  Log:
    * ext/openssl/ossl.h: LibreSSL doesn't have and need e_os2.h.

  Modified files:
    trunk/ChangeLog
    trunk/ext/openssl/ossl.h
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52692)
+++ ChangeLog	(revision 52693)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Nov 21 13:05:16 2015  NARUSE, Yui  <naruse@r...>
+
+	* ext/openssl/ossl.h: LibreSSL doesn't have and need e_os2.h.
+
 Sat Nov 21 09:18:10 2015  Koichi Sasada  <ko1@a...>
 
 	* thread_sync.c: reduce the specification of Queue#close.
Index: ext/openssl/ossl.h
===================================================================
--- ext/openssl/ossl.h	(revision 52692)
+++ ext/openssl/ossl.h	(revision 52693)
@@ -44,7 +44,7 @@ extern "C" { https://github.com/ruby/ruby/blob/trunk/ext/openssl/ossl.h#L44
 #  define assert(condition)
 #endif
 
-#if defined(_WIN32)
+#if defined(_WIN32) && !defined(LIBRESSL_VERSION_NUMBER)
 #  include <openssl/e_os2.h>
 #  define OSSL_NO_CONF_API 1
 #  if !defined(OPENSSL_SYS_WIN32)

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