diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-01 05:18:02 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-01 05:18:02 +0000 |
| commit | d32155358c67466d038436e6f03d41494043c53b (patch) | |
| tree | 1f325a04a07f9a5fafa01f0d24f5b7c2bdd7744b | |
| parent | 633cebb0efdf00b9a49493b65614c2d2d3b84905 (diff) | |
* ext/openssl/deprecation.rb (OpenSSL.check_func): check if header is
available for macro compatibility.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35507 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/openssl/deprecation.rb | 9 |
2 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Tue May 1 14:17:59 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/openssl/deprecation.rb (OpenSSL.check_func): check if header is + available for macro compatibility. + Tue May 1 10:53:54 2012 NAKAMURA Usaku <usa@ruby-lang.org> * test/ruby/test_settracefunc.rb: ignore traces from another threads diff --git a/ext/openssl/deprecation.rb b/ext/openssl/deprecation.rb index d026f02807..39ebfa0d37 100644 --- a/ext/openssl/deprecation.rb +++ b/ext/openssl/deprecation.rb @@ -1,5 +1,5 @@ module OpenSSL - def self.check_func(func, header) + def self.deprecated_warning_flag unless flag = (@deprecated_warning_flag ||= nil) if try_compile("", flag = "-Werror=deprecated-declarations") if with_config("broken-apple-openssl") @@ -11,6 +11,11 @@ module OpenSSL end @deprecated_warning_flag = flag end - have_func(func, header, flag) + flag + end + + def self.check_func(func, header) + have_func(func, header, deprecated_warning_flag) and + have_header(header, nil, deprecated_warning_flag) end end |