shyouhei	2008-08-04 13:43:34 +0900 (Mon, 04 Aug 2008)

  New Revision: 18333

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18333

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

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/ext/openssl/openssl_missing.h
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ext/openssl/openssl_missing.h
===================================================================
--- ruby_1_8_6/ext/openssl/openssl_missing.h	(revision 18332)
+++ ruby_1_8_6/ext/openssl/openssl_missing.h	(revision 18333)
@@ -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
  */
Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 18332)
+++ ruby_1_8_6/ChangeLog	(revision 18333)
@@ -1,3 +1,8 @@
+Mon Aug  4 13:39:53 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* numeric.c (check_uint, rb_num2uint, rb_fix2uint): fixed wrong check
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 18332)
+++ ruby_1_8_6/version.h	(revision 18333)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/