From: Benjamin Peterson Date: Fri, 3 Jul 2009 13:30:25 +0000 (+0000) Subject: remove duplicate declartions #6405 X-Git-Tag: v3.2a1~2894 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89b89170221a20429bbc1f3baa1d96eff1cea792;p=python 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 7eb76a98b0..343fbc6e95 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -27,6 +27,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