summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-07-03 13:30:25 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-07-03 13:30:25 (GMT)
commit89b89170221a20429bbc1f3baa1d96eff1cea792 (patch)
tree2942200069bc2331cc23c13c0a8699d62f00214e
parentce0f403a5d94cc3e7fdcf29e8c17a8a143c5936d (diff)
downloadcpython-89b89170221a20429bbc1f3baa1d96eff1cea792.zip
cpython-89b89170221a20429bbc1f3baa1d96eff1cea792.tar.gz
cpython-89b89170221a20429bbc1f3baa1d96eff1cea792.tar.bz2
remove duplicate declartions #6405
-rw-r--r--Include/descrobject.h2
-rw-r--r--Misc/NEWS2
2 files changed, 2 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 *);
diff --git a/Misc/NEWS b/Misc/NEWS
index 7eb76a9..343fbc6 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