summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--gc.c2
-rw-r--r--include/ruby/ruby.h2
-rw-r--r--version.h2
4 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ce16be040..09ff584a9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 15 10:35:43 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/ruby.h (FIXNUM_P): simple flag should be int.
+
Wed Feb 15 10:33:41 2012 Eric Hodel <drbrain@segment7.net>
* vm_eval.c (check_funcall): Call respond_to? with matching arity for
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;
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 5b4f9e02e1..fc17f76547 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -335,7 +335,7 @@ rb_long2int(long n) {rb_long2int_internal(n, i); return i;}
#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))
diff --git a/version.h b/version.h
index 4d911cd96c..5057017a2d 100644
--- a/version.h
+++ b/version.h
@@ -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