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 15041ffe187aa3ba2513cf5f4383fe0b335ce1c1..f06b42190d99ed61af0daefc8d028000261eea2b 100644 (file)
--- 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 9f09a4cdaae45f359ca307e9baef598428f5d2e7..1cdd83262c80d2d545f9ba5e64b810d15189adce 100644 (file)
--- 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