yugui	2011-08-11 09:38:30 +0900 (Thu, 11 Aug 2011)

  New Revision: 32918

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

  Log:
    merges r32288 and r32292 from trunk into ruby_1_9_2.
    --
    * ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
    --
    * ext/openssl/ossl.h (OPENSSL_SYS_WIN32): define only if not defined.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/openssl/ossl.h
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 32917)
+++ ruby_1_9_2/ChangeLog	(revision 32918)
@@ -1,3 +1,7 @@
+Wed Jun 29 23:17:57 2011  WATANABE Hirofumi  <eban@r...>
+
+	* ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys).
+
 Wed Jun 29 13:55:36 2011  Yukihiro Matsumoto  <matz@r...>
 
 	* variable.c (rb_const_get_0): should not look for superclasses if
@@ -110,7 +114,7 @@
 
 Wed Jun 29 23:09:14 2011  WATANABE Hirofumi  <eban@r...>
 
-	* ex/tk/extconf.rb: support for the latest ActiveTcl with mingw.
+	* ext/tk/extconf.rb (intptr_t, uintptr_t): support for the latest ActiveTcl with mingw.
 
 Sun Jun 12 16:19:48 2011  Hidetoshi NAGAI  <nagai@a...>
 
Index: ruby_1_9_2/ext/openssl/ossl.h
===================================================================
--- ruby_1_9_2/ext/openssl/ossl.h	(revision 32917)
+++ ruby_1_9_2/ext/openssl/ossl.h	(revision 32918)
@@ -46,6 +46,9 @@
 
 #if defined(_WIN32)
 #  define OSSL_NO_CONF_API 1
+#  if !defined(OPENSSL_SYS_WIN32)
+#    define OPENSSL_SYS_WIN32 1
+#  endif
 #  include <winsock2.h>
 #endif
 #include <errno.h>
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 32917)
+++ ruby_1_9_2/version.h	(revision 32918)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 303
+#define RUBY_PATCHLEVEL 304
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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