Issue #6477: Merge with 3.3.

This commit is contained in:
Alexandre Vassalotti 2013-11-30 16:21:20 -08:00
commit 3c23e7a5dc
6 changed files with 58 additions and 4 deletions

View file

@ -829,6 +829,9 @@ they can have object code that is not dependent on Python compilation flags.
PyAPI_FUNC(void) Py_IncRef(PyObject *);
PyAPI_FUNC(void) Py_DecRef(PyObject *);
PyAPI_DATA(PyTypeObject) PyNone_Type;
PyAPI_DATA(PyTypeObject) PyNotImplemented_Type;
/*
_Py_NoneStruct is an object of undefined type which can be used in contexts
where NULL (nil) is not suitable (since NULL often means 'error').