[pypy-svn] r47651 - in pypy/dist/pypy: rlib rpython/lltypesystem

[fijal at codespeak.net]

Author: fijal
Date: Sat Oct 20 19:44:33 2007
New Revision: 47651

Modified:
   pypy/dist/pypy/rlib/libffi.py
   pypy/dist/pypy/rpython/lltypesystem/rffi.py
Log:
Mess part 321443223...


Modified: pypy/dist/pypy/rlib/libffi.py
==============================================================================
--- pypy/dist/pypy/rlib/libffi.py	(original)
+++ pypy/dist/pypy/rlib/libffi.py	Sat Oct 20 19:44:33 2007
@@ -111,9 +111,9 @@
 FFI_OK = cConfig.FFI_OK
 FFI_BAD_TYPEDEF = cConfig.FFI_BAD_TYPEDEF
 FFI_DEFAULT_ABI = rffi.cast(rffi.USHORT, cConfig.FFI_DEFAULT_ABI)
-FFI_CIFP = rffi.COpaquePtr('ffi_cif', _includes_=includes,
-                           _include_dirs_=include_dirs,
-                           _library_dirs_=lib_dirs)
+FFI_CIFP = rffi.COpaquePtr('ffi_cif', includes=includes,
+                           include_dirs=include_dirs,
+                           library_dirs=lib_dirs)
 
 VOIDPP = rffi.CArrayPtr(rffi.VOIDP)
 

Modified: pypy/dist/pypy/rpython/lltypesystem/rffi.py
==============================================================================
--- pypy/dist/pypy/rpython/lltypesystem/rffi.py	(original)
+++ pypy/dist/pypy/rpython/lltypesystem/rffi.py	Sat Oct 20 19:44:33 2007
@@ -233,7 +233,8 @@
         from pypy.rpython.tool import rffi_platform
         k = {}
         for _name, value in kwds.items():
-            if _name in ['includes', 'include_dirs', 'libraries']:
+            if _name in ['includes', 'include_dirs', 'libraries',
+                         'library_dirs']:
                 k['_%s_' % _name] = value
         return rffi_platform.sizeof(name, '', **k)