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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34617 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 1 insertions, 1 deletions

diff --git a/gc.c b/gc.c
index aacc792bd0..630971d580 100644
--- a/gc.c
+++ b/gc.c
@@ -512,7 +512,7 @@ rb_objspace_free(rb_objspace_t *objspace)
 /* 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;