summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-07-03 13:33:17 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-07-03 13:33:17 (GMT)
commitb166ffdc3a8458aaa2585ddbdd33e356e62b5c75 (patch)
tree17947d8e52919421fbeaa512328db6a7cc9e2ab6 /Include
parent3efca3996a84f93e6246f211af51f0ff8d539366 (diff)
downloadcpython-b166ffdc3a8458aaa2585ddbdd33e356e62b5c75.zip
cpython-b166ffdc3a8458aaa2585ddbdd33e356e62b5c75.tar.gz
cpython-b166ffdc3a8458aaa2585ddbdd33e356e62b5c75.tar.bz2
Merged revisions 73809 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r73809 | benjamin.peterson | 2009-07-03 08:30:25 -0500 (Fri, 03 Jul 2009) | 1 line remove duplicate declartions #6405 ........
Diffstat (limited to 'Include')
-rw-r--r--Include/descrobject.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/Include/descrobject.h b/Include/descrobject.h
index 15041ff..f06b421 100644
--- a/Include/descrobject.h
+++ b/Include/descrobject.h
@@ -73,8 +73,6 @@ PyAPI_DATA(PyTypeObject) PyMemberDescr_Type;
PyAPI_DATA(PyTypeObject) PyMethodDescr_Type;
PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type;
PyAPI_DATA(PyTypeObject) PyDictProxy_Type;
-PyAPI_DATA(PyTypeObject) PyGetSetDescr_Type;
-PyAPI_DATA(PyTypeObject) PyMemberDescr_Type;
PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *);
PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *);