kosaki	2012-01-03 10:05:41 +0900 (Tue, 03 Jan 2012)

  New Revision: 34185

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

  Log:
    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]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/include/ruby/ruby.h
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/include/ruby/ruby.h
===================================================================
--- ruby_1_9_3/include/ruby/ruby.h	(revision 34184)
+++ ruby_1_9_3/include/ruby/ruby.h	(revision 34185)
@@ -258,6 +258,22 @@
 # 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
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34184)
+++ ruby_1_9_3/ChangeLog	(revision 34185)
@@ -1,3 +1,8 @@
+Mon Jan  2 20:05:10 2012  NARUSE, Yui  <naruse@r...>
+
+	* 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  <nobu@r...>
 
 	* ext/pty/pty.c (pty_check): should return nil until the child
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34184)
+++ ruby_1_9_3/version.h	(revision 34185)
@@ -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"
 

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