diff options
| author | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-26 01:49:36 +0000 |
|---|---|---|
| committer | emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-26 01:49:36 +0000 |
| commit | 41fa4bd7151f0a3c713d2bb3f4c08d2e8099b294 (patch) | |
| tree | a4c320238e568365124993efe561c0649d4a012d | |
| parent | bdf357bf5eae625c606bff423a2299ba0cd69853 (diff) | |
* ext/openssl/extconf.rb: remove checks for available functions.
* ext/openssl/missing.h: ditto.
Thanks, Tim Mooney for reporting this!
[Bug #5432] [ruby-core:40088]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ext/openssl/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/openssl/ruby_missing.h | 13 |
3 files changed, 7 insertions, 15 deletions
@@ -1,3 +1,10 @@ +Sat Nov 26 10:47:50 2011 Martin Bosslet <Martin.Bosslet@googlemail.com> + + * ext/openssl/extconf.rb: remove checks for available functions. + * ext/openssl/missing.h: ditto. + Thanks, Tim Mooney for reporting this! + [Bug #5432] [ruby-core:40088] + Sat Nov 26 10:22:28 2011 Martin Bosslet <Martin.Bosslet@googlemail.com> * ext/openssl/ossl_ssl.c: add comment on where to find implementation diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index a7872e19a2..3cea2ded7b 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -65,8 +65,6 @@ unless have_header("openssl/conf_api.h") exit 1 end -%w"rb_str_set_len rb_block_call".each {|func| have_func(func, "ruby.h")} - message "=== Checking for OpenSSL features... ===\n" have_func("ERR_peek_last_error") have_func("ASN1_put_eoc") diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h index 1c5d05baca..0f9de1c842 100644 --- a/ext/openssl/ruby_missing.h +++ b/ext/openssl/ruby_missing.h @@ -25,17 +25,4 @@ #define rb_io_t OpenFile #endif -#ifndef HAVE_RB_STR_SET_LEN -/* these methods should probably be backported to 1.8 */ -#define rb_str_set_len(str, length) do { \ - RSTRING(str)->ptr[(length)] = 0; \ - RSTRING(str)->len = (length); \ -} while(0) -#endif /* ! HAVE_RB_STR_SET_LEN */ - -#ifndef HAVE_RB_BLOCK_CALL -/* the openssl module doesn't use arg[3-4] and arg2 is always rb_each */ -#define rb_block_call(arg1, arg2, arg3, arg4, arg5, arg6) rb_iterate(rb_each, (arg1), (arg5), (arg6)) -#endif /* ! HAVE_RB_BLOCK_CALL */ - #endif /* _OSSL_RUBY_MISSING_H_ */ |