[pypy-svn] r16316 - pypy/dist/pypy/rpython/memory

[cfbolz at codespeak.net]

Author: cfbolz
Date: Tue Aug 23 19:02:59 2005
New Revision: 16316

Modified:
   pypy/dist/pypy/rpython/memory/lltypelayout.py
   pypy/dist/pypy/rpython/memory/support.py
Log:
oops, our ints are really longs on C-level.


Modified: pypy/dist/pypy/rpython/memory/lltypelayout.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/lltypelayout.py	(original)
+++ pypy/dist/pypy/rpython/memory/lltypelayout.py	Tue Aug 23 19:02:59 2005
@@ -3,8 +3,8 @@
 
 import struct
 
-primitive_to_fmt = {lltype.Signed:          "i",
-                    lltype.Unsigned:        "I",
+primitive_to_fmt = {lltype.Signed:          "l",
+                    lltype.Unsigned:        "L",
                     lltype.Char:            "c",
                     lltype.Bool:            "B",
                     lltype.Float:           "d",

Modified: pypy/dist/pypy/rpython/memory/support.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/support.py	(original)
+++ pypy/dist/pypy/rpython/memory/support.py	Tue Aug 23 19:02:59 2005
@@ -1,8 +1,9 @@
 from pypy.rpython.memory.lladdress import raw_malloc, raw_free, NULL
-
+from pypy.rpython import lltype
+from pypy.rpython.memory.lltypelayout import sizeof
 import struct
 
-INT_SIZE = struct.calcsize("i")
+INT_SIZE = sizeof(lltype.Signed)
 
 class AddressLinkedList(object):
     _alloc_flavor_ = ""