From 9edcc5e99af8a859b0b3f4f0f3ac9174a611d8c9 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Mon, 8 Sep 2003 20:19:01 +0000 Subject: [PATCH] * ext/openssl/ossl_config.rb: avoid compile error in OpenSSL-0.9.6. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ ext/openssl/ossl_config.c | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/ChangeLog b/ChangeLog index 30f2c24a1e..ed9e46b88e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Sep 9 05:17:04 2003 GOTOU Yuuzou + + * ext/openssl/ossl_config.rb: avoid compile error in OpenSSL-0.9.6. + Tue Sep 9 01:50:45 2003 GOTOU Yuuzou * lib/webrick/httpserver.rb (HTTPServer#access_log): add "\n" to diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c index fe5eba7211..835f2a5b3d 100644 --- a/ext/openssl/ossl_config.c +++ b/ext/openssl/ossl_config.c @@ -264,6 +264,7 @@ ossl_config_get_section_old(VALUE self, VALUE section) return ossl_config_get_section(self, section); } +#ifdef IMPLEMENT_LHASH_DOALL_ARG_FN static void get_conf_section(CONF_VALUE *cv, VALUE ary) { @@ -285,7 +286,16 @@ ossl_config_get_sections(VALUE self) return ary; } +#else +static VALUE +ossl_config_get_sections(VALUE self) +{ + rb_warn("Config::sections don't work with %s", OPENSSL_VERSION_TEXT); + return rb_ary_new(); +} +#endif +#ifdef IMPLEMENT_LHASH_DOALL_ARG_FN static void dump_conf_value(CONF_VALUE *cv, VALUE str) { @@ -331,6 +341,14 @@ ossl_config_to_s(VALUE self) return dump_conf(conf); } +#else +static VALUE +ossl_config_to_s(VALUE self) +{ + rb_warn("Config::to_s don't work with %s", OPENSSL_VERSION_TEXT); + return rb_str_new(0, 0); +} +#endif static VALUE ossl_config_inspect(VALUE self)