diff options
Diffstat (limited to 'ext/openssl')
-rw-r--r-- | ext/openssl/extconf.rb | 5 | ||||
-rw-r--r-- | ext/openssl/ossl.h | 8 | ||||
-rw-r--r-- | ext/openssl/ruby_missing.h | 54 |
3 files changed, 6 insertions, 61 deletions
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb index 92dabdc587..978f9dbb69 100644 --- a/ext/openssl/extconf.rb +++ b/ext/openssl/extconf.rb @@ -79,15 +79,12 @@ have_func("BN_mod_sub") have_func("BN_rand_range") have_func("BN_pseudo_rand_range") have_func("CONF_get1_default_config_file") -if try_cpp("#define FOO(a, ...) foo(a, ##__VA_ARGS__)\n int x(){FOO(1,2);}\n") +if try_cpp("#define FOO(a, ...) foo(a, ##__VA_ARGS__)\n int x(){FOO(1);FOO(1,2);FOO(1,2,3);}\n") $defs.push("-DHAVE_VA_ARGS_MACRO") end have_header("openssl/ocsp.h") have_struct_member("EVP_CIPHER_CTX", "flags", "openssl/evp.h") -message "=== Checking for Ruby features... ===\n" -have_func("rb_obj_init_copy", "ruby.h") - message "=== Checking done. ===\n" $distcleanfiles << "GNUmakefile" << "dep" create_makefile("openssl") diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 72b183986e..7a8b3e1853 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -16,15 +16,13 @@ extern "C" { #endif /* - * Check the Ruby version and OpenSSL + * Check the OpenSSL version * The only supported are: - * Ruby >= 1.7.2 * OpenSSL >= 0.9.7 */ -#include <version.h> #include <openssl/opensslv.h> -#if defined(NT) || defined(_WIN32) +#if defined(_WIN32) # define OpenFile WINAPI_OpenFile #endif #include <errno.h> @@ -40,7 +38,7 @@ extern "C" { # define OSSL_OCSP_ENABLED # include <openssl/ocsp.h> #endif -#if defined(NT) || defined(_WIN32) +#if defined(_WIN32) # undef OpenFile #endif diff --git a/ext/openssl/ruby_missing.h b/ext/openssl/ruby_missing.h index bdb152b08e..f9e74f743e 100644 --- a/ext/openssl/ruby_missing.h +++ b/ext/openssl/ruby_missing.h @@ -11,60 +11,10 @@ #if !defined(_OSSL_RUBY_MISSING_H_) #define _OSS_RUBY_MISSING_H_ -#if !defined(StringValue) -# define StringValue(v) \ - if (TYPE(v) != T_STRING) v = rb_str_to_str(v) -#endif +#define DEFINE_ALLOC_WRAPPER(func) -#if !defined(StringValuePtr) -# define StringValuePtr(v) \ - RSTRING((TYPE(v) == T_STRING) ? (v) : rb_str_to_str(v))->ptr -#endif - -#if !defined(SafeStringValue) -# define SafeStringValue(v) do {\ - StringValue(v);\ - rb_check_safe_str(v);\ -} while (0) -#endif - -#if RUBY_VERSION_CODE < 180 -# define rb_cstr_to_inum(a,b,c) \ - rb_cstr2inum(a,b) -# define rb_check_frozen(obj) \ - if (OBJ_FROZEN(obj)) rb_error_frozen(rb_obj_classname(obj)) -# define rb_obj_classname(obj) \ - rb_class2name(CLASS_OF(obj)) -#endif - -#if HAVE_RB_DEFINE_ALLOC_FUNC -# define DEFINE_ALLOC_WRAPPER(func) -#else -# define DEFINE_ALLOC_WRAPPER(func) \ - static VALUE \ - func##_wrapper(int argc, VALUE *argv, VALUE klass) \ - { \ - VALUE obj; \ - \ - obj = func(klass); \ - \ - rb_obj_call_init(obj, argc, argv); \ - \ - return obj; \ - } -# define rb_define_alloc_func(klass, func) \ - rb_define_singleton_method(klass, "new", func##_wrapper, -1) -#endif - -#if RUBY_VERSION_CODE >= 180 -# if !defined(HAVE_RB_OBJ_INIT_COPY) -# define rb_define_copy_func(klass, func) \ - rb_define_method(klass, "copy_object", func, 1) -# else -# define rb_define_copy_func(klass, func) \ +#define rb_define_copy_func(klass, func) \ rb_define_method(klass, "initialize_copy", func, 1) -# endif -#endif #endif /* _OSS_RUBY_MISSING_H_ */ |