[pypy-commit] pypy float-bytes: merged default in

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: float-bytes
Changeset: r53693:35ba34408bab
Date: 2012-03-15 11:16 -0700
http://bitbucket.org/pypy/pypy/changeset/35ba34408bab/

Log:	merged default in

diff --git a/pypy/rlib/rarithmetic.py b/pypy/rlib/rarithmetic.py
--- a/pypy/rlib/rarithmetic.py
+++ b/pypy/rlib/rarithmetic.py
@@ -469,10 +469,6 @@
 r_longlong = build_int('r_longlong', True, 64)
 r_ulonglong = build_int('r_ulonglong', False, 64)
 
-# XXX THESE ARE SERIOUSLY BOGUS, DON'T USE!!
-r_long = build_int('r_long', True, 32)
-r_ulong = build_int('r_ulong', False, 32)
-
 longlongmax = r_longlong(LONGLONG_TEST - 1)
 
 if r_longlong is not r_int:
@@ -481,10 +477,7 @@
     r_int64 = int
 
 # needed for ll_os_stat.time_t_to_FILE_TIME in the 64 bit case
-if r_long is not r_int:
-    r_uint32 = r_ulong
-else:
-    r_uint32 = r_uint
+r_uint32 = build_int('r_uint32', False, 32)
 
 # needed for ll_time.time_sleep_llimpl
 maxint32 = int((1 << 31) -1)
diff --git a/pypy/rpython/lltypesystem/ll2ctypes.py b/pypy/rpython/lltypesystem/ll2ctypes.py
--- a/pypy/rpython/lltypesystem/ll2ctypes.py
+++ b/pypy/rpython/lltypesystem/ll2ctypes.py
@@ -84,14 +84,14 @@
             else:
                 PIECESIZE = 0x08000000
         PIECES = 10
-        flags = 0
+        flags = (0,)
         if _LINUX:
             flags = (rmmap.MAP_PRIVATE|rmmap.MAP_ANONYMOUS|rmmap.MAP_NORESERVE,
                      rmmap.PROT_READ|rmmap.PROT_WRITE)
         if _MS_WINDOWS:
-            flags = rmmap.MEM_RESERVE
+            flags = (rmmap.MEM_RESERVE,)
             # XXX seems not to work
-        m = rmmap.mmap(-1, PIECES * PIECESIZE, flags)
+        m = rmmap.mmap(-1, PIECES * PIECESIZE, *flags)
         m.close = lambda : None    # leak instead of giving a spurious
                                    # error at CPython's shutdown
         m._ll2ctypes_pieces = []