[pypy-commit] pypy win64-stage1: Merge with default

[ctismer]

Author: Christian Tismer <tismer at stackless.com>
Branch: win64-stage1
Changeset: r53519:cd9a63265d54
Date: 2012-03-13 17:06 -0700
http://bitbucket.org/pypy/pypy/changeset/cd9a63265d54/

Log:	Merge with default

diff --git a/pypy/rlib/rarithmetic.py b/pypy/rlib/rarithmetic.py
--- a/pypy/rlib/rarithmetic.py
+++ b/pypy/rlib/rarithmetic.py
@@ -103,7 +103,7 @@
     n &= LONG_MASK
     if n >= LONG_TEST:
         n -= 2*LONG_TEST
-    return n
+    return int(n)
 
 def longlongmask(n):
     assert isinstance(n, (int, long))