merge heads

This commit is contained in:
Benjamin Peterson 2015-03-02 13:24:21 -05:00
commit 241520ad10
1 changed files with 0 additions and 3 deletions

View File

@ -1825,9 +1825,6 @@ _Py_GetObjects(PyObject *self, PyObject *args)
#endif
/* Hack to force loading of pycapsule.o */
PyTypeObject *_PyCapsule_hack = &PyCapsule_Type;
/* Hack to force loading of abstract.o */
Py_ssize_t (*_Py_abstract_hack)(PyObject *) = PyObject_Size;