[pypy-svn] r47645 - in pypy/dist/pypy/module: bz2 thread

[fijal at codespeak.net]

Author: fijal
Date: Sat Oct 20 16:52:07 2007
New Revision: 47645

Modified:
   pypy/dist/pypy/module/bz2/interp_bz2.py
   pypy/dist/pypy/module/thread/ll_thread.py
Log:
Update API


Modified: pypy/dist/pypy/module/bz2/interp_bz2.py
==============================================================================
--- pypy/dist/pypy/module/bz2/interp_bz2.py	(original)
+++ pypy/dist/pypy/module/bz2/interp_bz2.py	Sat Oct 20 16:52:07 2007
@@ -34,8 +34,9 @@
                                  ('bzfree', lltype.Ptr(_free_type)),
                                  ('opaque', rffi.VOIDP),
                                  ])
-    FILE = platform.COpaquePtr('FILE')
-    BZFILE = platform.COpaquePtr('BZFILE')
+
+FILE = rffi.COpaquePtr('FILE')
+BZFILE = rffi.COpaquePtr('BZFILE')
 
 
 constants = {}
@@ -72,8 +73,6 @@
 BZ_MEM_ERROR = cConfig.BZ_MEM_ERROR
 BZ_UNEXPECTED_EOF = cConfig.BZ_UNEXPECTED_EOF
 BZ_SEQUENCE_ERROR = cConfig.BZ_SEQUENCE_ERROR
-BZFILE = cConfig.BZFILE
-FILE = cConfig.FILE
 
 if BUFSIZ < 8192:
     SMALLCHUNK = 8192

Modified: pypy/dist/pypy/module/thread/ll_thread.py
==============================================================================
--- pypy/dist/pypy/module/thread/ll_thread.py	(original)
+++ pypy/dist/pypy/module/thread/ll_thread.py	Sat Oct 20 16:52:07 2007
@@ -37,9 +37,9 @@
 c_thread_start = llexternal('RPyThreadStart', [CALLBACK, rffi.VOIDP], rffi.INT)
 c_thread_get_ident = llexternal('RPyThreadGetIdent', [], rffi.INT)
 
-TLOCKP = platform.copaque('struct RPyOpaque_ThreadLock', '',
-                          _includes_=includes,
-                          _include_dirs_=include_dirs)
+TLOCKP = rffi.COpaquePtr('struct RPyOpaque_ThreadLock',
+                          includes=includes,
+                          include_dirs=include_dirs)
 
 c_thread_lock_init = llexternal('RPyThreadLockInit', [TLOCKP], lltype.Void)
 c_thread_acquirelock = llexternal('RPyThreadAcquireLock', [TLOCKP, rffi.INT],