From 7444bbac6b06eeb7429a124769e2d62f92fe1104 Mon Sep 17 00:00:00 2001 From: kosaki Date: Tue, 3 Jan 2012 01:05:41 +0000 Subject: merge revision(s) 33532: * 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_3@34185 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ include/ruby/ruby.h | 16 ++++++++++++++++ version.h | 6 +++--- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03f282a02d..444eb83422 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 2 20:05:10 2012 NARUSE, Yui + + * include/ruby/ruby.h (SIZE_MAX): define SIZE_MAX if not defined. + patched by The Written Word Inc. [ruby-core:40422] [Bug #5489] + Mon Jan 2 20:00:01 2012 Nobuyoshi Nakada * ext/pty/pty.c (pty_check): should return nil until the child diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 340bea102a..5b4f9e02e1 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -258,6 +258,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 diff --git a/version.h b/version.h index a9509fd3ab..10248b2c2c 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 10 +#define RUBY_PATCHLEVEL 11 -#define RUBY_RELEASE_DATE "2012-01-03" +#define RUBY_RELEASE_DATE "2012-01-02" #define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 3 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" -- cgit v1.2.3