diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-04 04:43:34 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-04 04:43:34 +0000 |
commit | c9463ec0af9151533c590e00fb8d45e51d679001 (patch) | |
tree | 1014b568ca4fc051b23b836ad23b438320dbac6d | |
parent | 519f06ed80093df52922eb0e48d5264037f4916d (diff) |
merge revision(s) 18181:
* ext/openssl/openssl_missing.h (d2i_of_void): define for older
versions. [ruby-dev:35637]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@18333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ext/openssl/openssl_missing.h | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 10 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Aug 4 13:39:53 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/openssl/openssl_missing.h (d2i_of_void): define for older + versions. [ruby-dev:35637] + Mon Aug 4 12:25:08 2008 NAKAMURA Usaku <usa@ruby-lang.org> * numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check diff --git a/ext/openssl/openssl_missing.h b/ext/openssl/openssl_missing.h index e8c75ca42c..7b1e019208 100644 --- a/ext/openssl/openssl_missing.h +++ b/ext/openssl/openssl_missing.h @@ -15,6 +15,10 @@ extern "C" { #endif +#ifndef TYPEDEF_D2I_OF +typedef char *d2i_of_void(); +#endif + /* * These functions are not included in headers of OPENSSL <= 0.9.6b */ @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-08-04" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080804 -#define RUBY_PATCHLEVEL 281 +#define RUBY_PATCHLEVEL 282 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 |