yugui	2012-02-18 17:59:57 +0900 (Sat, 18 Feb 2012)

  New Revision: 34675

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

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

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

Index: ruby_1_9_2/include/ruby/ruby.h
===================================================================
--- ruby_1_9_2/include/ruby/ruby.h	(revision 34674)
+++ ruby_1_9_2/include/ruby/ruby.h	(revision 34675)
@@ -256,6 +256,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_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 34674)
+++ ruby_1_9_2/ChangeLog	(revision 34675)
@@ -1,3 +1,8 @@
+Thu Oct 27 09:57:56 2011  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]
+
 Tue Feb 14 00:00:19 2012  okkez  <okkez000@g...>
 
 	* thread_pthread.c (rb_thread_create_timer_thread): fix memory
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 34674)
+++ ruby_1_9_2/version.h	(revision 34675)
@@ -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

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