merge revision(s) 18181:

	* ext/openssl/openssl_missing.h (d2i_of_void): define for older
	  versions.  [ruby-dev:35637]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@18333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 39653dc5f..532945f08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 e8c75ca42..7b1e01920 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
  */
diff --git a/version.h b/version.h
index 0af3b5141..2f4ea645d 100644
--- a/version.h
+++ b/version.h
@@ -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