Merge branch 'mybranch' of git://github.com/orangea/ruby into trunk

Conflicts:
	ChangeLog

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

ChangeLog

@@ -1,3 +1,7 @@
+Wed Jul  7 10:01:34 2010  Adrian Bloomer  <adrian.bloomer@gmail.com>
+
+	* numeric.c (fix_rev): Replaced fix_rev with '~num | FIXNUM_FLAG'.
+
 Wed Jul  7 13:22:20 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* file.c (ruby_find_basename): set correct baselen.
@@ -24,7 +28,6 @@ Wed Jul  7 10:26:20 2010  NARUSE, Yui  <naruse@ruby-lang.org>
 	  it causes false-negative exceptions. [ruby-dev:41778]
 
 	* configure.in: ditto.
-
 Tue Jul  6 22:57:21 2010  Tanaka Akira  <akr@fsij.org>
 
 	* io.c (nogvl_copy_stream_sendfile): jump to retry_sendfile directly

numeric.c

@@ -2801,10 +2801,7 @@ fix_le(VALUE x, VALUE y)
 static VALUE
 fix_rev(VALUE num)
 {
-    long val = FIX2LONG(num);
-
-    val = ~val;
-    return LONG2NUM(val);
+    return ~num | FIXNUM_FLAG;
 }
 
 static VALUE