kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

merges r33532 from trunk into ruby_1_9_2. 

--
* include/ruby/ruby.h (SIZE_MAX): define SIZE_MAX if not defined.
  patched by The Written Word Inc. [ruby-core:40422] [Bug #5489]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@34675 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2012-02-18 08:59:57 +00:00
parent cedd050e4d
commit 80e35fa21c
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Oct 27 09:57:56 2011 NARUSE, Yui <naruse@ruby-lang.org>
* include/ruby/ruby.h (SIZE_MAX): define SIZE_MAX if not defined.
patched by The Written Word Inc. [ruby-core:40422] [Bug #5489]
Tue Feb 14 00:00:19 2012 okkez <okkez000@gmail.com>
* thread_pthread.c (rb_thread_create_timer_thread): fix memory

16
include/ruby/ruby.h
View File

@ -256,6 +256,22 @@ VALUE rb_ull2inum(unsigned LONG_LONG);
# define SSIZET2NUM(v) INT2NUM(v)
#endif
#ifndef SIZE_MAX
# if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
# define SIZE_MAX ULLONG_MAX
# define SIZE_MIN ULLONG_MIN
# elif SIZEOF_SIZE_T == SIZEOF_LONG
# define SIZE_MAX ULONG_MAX
# define SIZE_MIN ULONG_MIN
# elif SIZEOF_SIZE_T == SIZEOF_INT
# define SIZE_MAX UINT_MAX
# define SIZE_MIN UINT_MIN
# else
# define SIZE_MAX USHRT_MAX
# define SIZE_MIN USHRT_MIN
# endif
#endif
#ifndef SSIZE_MAX
# if SIZEOF_SIZE_T > SIZEOF_LONG && defined(HAVE_LONG_LONG)
# define SSIZE_MAX LLONG_MAX

2
version.h
View File

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.2"
#define RUBY_PATCHLEVEL 316
#define RUBY_PATCHLEVEL 317
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 1