From: Benjamin Peterson Date: Fri, 3 Jul 2009 13:33:17 +0000 (+0000) Subject: Merged revisions 73809 via svnmerge from X-Git-Tag: v3.1.1rc1~105 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b166ffdc3a8458aaa2585ddbdd33e356e62b5c75;p=python 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 ........ --- diff --git a/Include/descrobject.h b/Include/descrobject.h index 15041ffe18..f06b42190d 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 *); diff --git a/Misc/NEWS b/Misc/NEWS index 9f09a4cdaa..1cdd83262c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -23,6 +23,8 @@ Core and Builtins C-API ----- +- Issue #6405: Remove duplicatet type declarations in descrobject.h. + - The code flags for old __future__ features are now available again. Library