[Python-checkins] r73810 - in python/branches/release31-maint: Include/descrobject.h Misc/NEWS

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri Jul  3 15:33:17 2009
New Revision: 73810

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Include/descrobject.h
   python/branches/release31-maint/Misc/NEWS

Modified: python/branches/release31-maint/Include/descrobject.h
==============================================================================
--- python/branches/release31-maint/Include/descrobject.h	(original)
+++ python/branches/release31-maint/Include/descrobject.h	Fri Jul  3 15:33:17 2009
@@ -73,8 +73,6 @@
 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 *);

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Fri Jul  3 15:33:17 2009
@@ -23,6 +23,8 @@
 C-API
 -----
 
+- Issue #6405: Remove duplicatet type declarations in descrobject.h.
+
 - The code flags for old __future__ features are now available again.
 
 Library