[pypy-commit] pypy ffi-backend: merge heads

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: ffi-backend
Changeset: r56500:f029add08095
Date: 2012-07-28 19:28 +0200
http://bitbucket.org/pypy/pypy/changeset/f029add08095/

Log:	merge heads

diff --git a/pypy/module/_cffi_backend/ctypeobj.py b/pypy/module/_cffi_backend/ctypeobj.py
--- a/pypy/module/_cffi_backend/ctypeobj.py
+++ b/pypy/module/_cffi_backend/ctypeobj.py
@@ -10,7 +10,7 @@
 
 
 class W_CType(Wrappable):
-    _attrs_   = ['space', 'size',  'name', 'name_position']
+    _attrs_   = ['space', 'size',  'name', 'name_position', '_lifeline_']
     _immutable_fields_ = ['size?', 'name', 'name_position']
     # note that 'size' is not strictly immutable, because it can change
     # from -1 to the real value in the W_CTypeStruct subclass.