diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-21 04:06:43 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-21 04:06:43 +0000 |
| commit | c964c738be8b5ad7b317918e8a89f7154666e565 (patch) | |
| tree | b5cc99aefd210173be65d545a0c87db2e2afc403 | |
| parent | 628d9057e415a1eb989b06218f68e8871763e4f7 (diff) | |
| download | ruby-c964c738be8b5ad7b317918e8a89f7154666e565.tar.gz | |
* ext/openssl/ossl.h: LibreSSL doesn't have and need e_os2.h.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52693 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sat Nov 21 13:05:16 2015 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/openssl/ossl.h: LibreSSL doesn't have and need e_os2.h. + Sat Nov 21 09:18:10 2015 Koichi Sasada <ko1@atdot.net> * thread_sync.c: reduce the specification of Queue#close. diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index eca0ef9448..3be01b0cb6 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -44,7 +44,7 @@ extern "C" { # 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) |