summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-09-08 20:19:01 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-09-08 20:19:01 +0000
commit2d7f1f2b3db4a1e75514db5d9fa885d2a8cbbd7c (patch)
tree5ae2793da363d84ba7c0cd7a49204147c1133719
parent26a9489a602c92289fb2543c3b13452fe66ae85e (diff)
downloadruby-2d7f1f2b3db4a1e75514db5d9fa885d2a8cbbd7c.tar.gz
ruby-2d7f1f2b3db4a1e75514db5d9fa885d2a8cbbd7c.tar.xz
ruby-2d7f1f2b3db4a1e75514db5d9fa885d2a8cbbd7c.zip
* ext/openssl/ossl_config.rb: avoid compile error in OpenSSL-0.9.6.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4538 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/openssl/ossl_config.c18
2 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 30f2c24a1..ed9e46b88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Sep 9 05:17:04 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
+
+ * ext/openssl/ossl_config.rb: avoid compile error in OpenSSL-0.9.6.
+
Tue Sep 9 01:50:45 2003 GOTOU Yuuzou <gotoyuzo@notwork.org>
* 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 fe5eba721..835f2a5b3 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)