[pypy-svn] r48407 - in pypy/dist/pypy/rpython/lltypesystem: . test

[rxe at codespeak.net]

Author: rxe
Date: Thu Nov  8 13:30:05 2007
New Revision: 48407

Modified:
   pypy/dist/pypy/rpython/lltypesystem/rffi.py
   pypy/dist/pypy/rpython/lltypesystem/test/test_rffi.py
Log:
unichars are normally 4 bytes

Modified: pypy/dist/pypy/rpython/lltypesystem/rffi.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rffi.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rffi.py	Thu Nov  8 13:30:05 2007
@@ -405,7 +405,7 @@
     if tp is lltype.Char:
         return 1
     if tp is lltype.UniChar:
-        return 2
+        return 4
     if tp is lltype.Float:
         return 8
     assert isinstance(tp, lltype.Number)

Modified: pypy/dist/pypy/rpython/lltypesystem/test/test_rffi.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/test/test_rffi.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/test/test_rffi.py	Thu Nov  8 13:30:05 2007
@@ -247,7 +247,7 @@
     cache = {
         lltype.Signed:   ctypes.c_long,
         lltype.Unsigned: ctypes.c_ulong,
-        lltype.UniChar:  ctypes.c_ushort,
+        lltype.UniChar:  ctypes.c_uint,
         lltype.Char:     ctypes.c_ubyte,
         DOUBLE:     ctypes.c_double,
         SIGNEDCHAR: ctypes.c_byte,