diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-03 07:21:53 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-03 07:21:53 +0000 |
| commit | 043479247cfe70d6464293a0b070f9bfaba608fd (patch) | |
| tree | 36ba0a8b02e92723f27dc7c69de18ba7f07b6a7d /ext | |
| parent | 8b95ee24de750995a0ffa7881b0c190315a98598 (diff) | |
* ext/openssl/extconf.rb: check for functions added in 1.9.
* ext/openssl/ruby_missing.h: check per features instead by
checking version code. [ruby-core:10845]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12140 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/openssl/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/openssl/ruby_missing.h | 22 |
2 files changed, 13 insertions, 11 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 98921bc468..27550f5dc7 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -59,6 +59,8 @@ 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("BN_mod_add") diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h index 3dd549cfca..64b76f26b4 100644 --- a/ext/openssl/ruby_missing.h +++ b/ext/openssl/ruby_missing.h @@ -9,33 +9,33 @@ * (See the file 'LICENCE'.) */ #if !defined(_OSSL_RUBY_MISSING_H_) -#define _OSS_RUBY_MISSING_H_ - -#include "version.h" +#define _OSSL_RUBY_MISSING_H_ #define rb_define_copy_func(klass, func) \ rb_define_method(klass, "initialize_copy", func, 1) -#if RUBY_VERSION_CODE >= 190 +#ifndef GetReadFile #define FPTR_TO_FD(fptr) (fptr->fd) #else +#define FPTR_TO_FD(fptr) (fileno(GetReadFile(fptr))) +#endif +#ifndef HAVE_RB_IO_T #define rb_io_t OpenFile -#define FPTR_TO_FD(fptr) (fileno(fptr->f)) - +#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 /* RUBY_VERSION_CODE >= 190 */ - - -#endif /* _OSS_RUBY_MISSING_H_ */ - +#endif /* _OSSL_RUBY_MISSING_H_ */ |