Kaydet (Commit) 31ec1428 authored tarafından Neil Schemenauer's avatar Neil Schemenauer

Change the GC type flag since the API has changed. Allow types using

the old flag to still compile.
üst 251ead8d
...@@ -389,12 +389,9 @@ given type object has a specified feature. ...@@ -389,12 +389,9 @@ given type object has a specified feature.
/* PySequenceMethods contains sq_contains */ /* PySequenceMethods contains sq_contains */
#define Py_TPFLAGS_HAVE_SEQUENCE_IN (1L<<1) #define Py_TPFLAGS_HAVE_SEQUENCE_IN (1L<<1)
/* Objects which participate in garbage collection (see objimp.h) */ /* This is here for backwards compatibility. Extensions that use the old GC
#ifdef WITH_CYCLE_GC * API will still compile but the objects will not be tracked by the GC. */
#define Py_TPFLAGS_GC (1L<<2) #define Py_TPFLAGS_GC 0 /* used to be (1L<<2) */
#else
#define Py_TPFLAGS_GC 0
#endif
/* PySequenceMethods and PyNumberMethods contain in-place operators */ /* PySequenceMethods and PyNumberMethods contain in-place operators */
#define Py_TPFLAGS_HAVE_INPLACEOPS (1L<<3) #define Py_TPFLAGS_HAVE_INPLACEOPS (1L<<3)
...@@ -429,6 +426,13 @@ given type object has a specified feature. ...@@ -429,6 +426,13 @@ given type object has a specified feature.
/* Set while the type is being 'readied', to prevent recursive ready calls */ /* Set while the type is being 'readied', to prevent recursive ready calls */
#define Py_TPFLAGS_READYING (1L<<13) #define Py_TPFLAGS_READYING (1L<<13)
/* Objects support garbage collection (see objimp.h) */
#ifdef WITH_CYCLE_GC
#define Py_TPFLAGS_HAVE_GC (1L<<14)
#else
#define Py_TPFLAGS_HAVE_GC 0
#endif
#define Py_TPFLAGS_DEFAULT ( \ #define Py_TPFLAGS_DEFAULT ( \
Py_TPFLAGS_HAVE_GETCHARBUFFER | \ Py_TPFLAGS_HAVE_GETCHARBUFFER | \
Py_TPFLAGS_HAVE_SEQUENCE_IN | \ Py_TPFLAGS_HAVE_SEQUENCE_IN | \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment