kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merges r32288 and r32292 from trunk into ruby_1_9_2.

Browse source 
--
* 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
This commit is contained in:
yugui 2011-08-11 00:38:30 +00:00
parent 5f1eb21845
commit a0948d8334
3 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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>

3
ext/openssl/ossl.h
View file

@ -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>

2
version.h
View file

@ -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