diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 00:38:30 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-08-11 00:38:30 +0000 |
| commit | a0948d8334936d086e6af4157674f90dedf35296 (patch) | |
| tree | 8fcd1b92ec8d2469bf63d8c2d88b55b8677ef1fd | |
| parent | 5f1eb218452a510cec93e05b6dbeb3307936f50d (diff) | |
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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@32918 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 3 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Wed Jun 29 23:17:57 2011 WATANABE Hirofumi <eban@ruby-lang.org> + + * ext/openssl/ossl.h (OPENSSL_SYS_WIN32): support for mingw(msys). + Wed Jun 29 13:55:36 2011 Yukihiro Matsumoto <matz@ruby-lang.org> * variable.c (rb_const_get_0): should not look for superclasses if @@ -110,7 +114,7 @@ Sun Jul 3 21:02:05 2011 Yuki Sonoda (Yugui) <yugui@yugui.jp> Wed Jun 29 23:09:14 2011 WATANABE Hirofumi <eban@ruby-lang.org> - * 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@ai.kyutech.ac.jp> diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index 4bb18d5020..1a5b263124 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -46,6 +46,9 @@ extern "C" { #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> @@ -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 |