diff options
| author | Nick Coghlan <ncoghlan@gmail.com> | 2011-10-23 12:36:42 (GMT) |
|---|---|---|
| committer | Nick Coghlan <ncoghlan@gmail.com> | 2011-10-23 12:36:42 (GMT) |
| commit | 9715d26305f7cf6c4db91f3670f1b7e99f04dd2d (patch) | |
| tree | 0bd6a35f21a42e42ac2bdeb09b0c5a3b9eb3188a /Include | |
| parent | a0e0e232993b87fe446f95d6583d947ae01bf517 (diff) | |
| parent | de31b191e570d00ed7917c7f9ea28af3e770c16d (diff) | |
| download | cpython-9715d26305f7cf6c4db91f3670f1b7e99f04dd2d.zip cpython-9715d26305f7cf6c4db91f3670f1b7e99f04dd2d.tar.gz cpython-9715d26305f7cf6c4db91f3670f1b7e99f04dd2d.tar.bz2 | |
Merge issue 1294232 patch from 3.2
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/object.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Include/object.h b/Include/object.h index cf231af..648c9cb 100644 --- a/Include/object.h +++ b/Include/object.h @@ -449,6 +449,7 @@ PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *, #ifndef Py_LIMITED_API PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *); PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, char *, PyObject **); +PyAPI_FUNC(PyTypeObject *) _PyType_CalculateMetaclass(PyTypeObject *, PyObject *); #endif PyAPI_FUNC(unsigned int) PyType_ClearCache(void); PyAPI_FUNC(void) PyType_Modified(PyTypeObject *); |