nobu	2012-02-15 10:36:49 +0900 (Wed, 15 Feb 2012)

  New Revision: 34617

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

  Log:
    merge revision(s) 34261,34351:
    ------------------------------------------------------------------------
    r34261 | nobu | 2012-01-10 15:52:24 +0900 (Tue, 10 Jan 2012) | 2 lines
    
    * gc.c (HEAP_OBJ_LIMIT): suppress narrowing down warning from gcc 4.2.
    
    ------------------------------------------------------------------------
    
    * include/ruby/ruby.h (FIXNUM_P): simple flag should be int.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/gc.c
    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 34616)
+++ ruby_1_9_3/include/ruby/ruby.h	(revision 34617)
@@ -335,7 +335,7 @@
 
 #define FIX2LONG(x) (long)RSHIFT((SIGNED_VALUE)(x),1)
 #define FIX2ULONG(x) ((((VALUE)(x))>>1)&LONG_MAX)
-#define FIXNUM_P(f) (((SIGNED_VALUE)(f))&FIXNUM_FLAG)
+#define FIXNUM_P(f) (((int)(SIGNED_VALUE)(f))&FIXNUM_FLAG)
 #define POSFIXABLE(f) ((f) < FIXNUM_MAX+1)
 #define NEGFIXABLE(f) ((f) >= FIXNUM_MIN)
 #define FIXABLE(f) (POSFIXABLE(f) && NEGFIXABLE(f))
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34616)
+++ ruby_1_9_3/ChangeLog	(revision 34617)
@@ -1,3 +1,7 @@
+Wed Feb 15 10:35:43 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/ruby.h (FIXNUM_P): simple flag should be int.
+
 Wed Feb 15 10:33:41 2012  Eric Hodel  <drbrain@s...>
 
 	* vm_eval.c (check_funcall):  Call respond_to? with matching arity for
Index: ruby_1_9_3/gc.c
===================================================================
--- ruby_1_9_3/gc.c	(revision 34616)
+++ ruby_1_9_3/gc.c	(revision 34617)
@@ -512,7 +512,7 @@
 /* 2KB */
 /*#define HEAP_SIZE 0x800 */
 
-#define HEAP_OBJ_LIMIT (HEAP_SIZE / sizeof(struct RVALUE))
+#define HEAP_OBJ_LIMIT (unsigned int)(HEAP_SIZE / sizeof(struct RVALUE))
 
 extern st_table *rb_class_tbl;
 
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34616)
+++ ruby_1_9_3/version.h	(revision 34617)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 119
+#define RUBY_PATCHLEVEL 120
 
 #define RUBY_RELEASE_DATE "2012-02-15"
 #define RUBY_RELEASE_YEAR 2012

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