merge revision(s) 18181:

shyouhei · shyouhei · commit 2ae40aef636f · 2008-08-04T04:44:17.000Z
* 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_7@18335 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git 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
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-08-04"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080804
-#define RUBY_PATCHLEVEL 65
+#define RUBY_PATCHLEVEL 66
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
