diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-07-03 13:33:17 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-07-03 13:33:17 +0000 |
| commit | b166ffdc3a8458aaa2585ddbdd33e356e62b5c75 (patch) | |
| tree | 17947d8e52919421fbeaa512328db6a7cc9e2ab6 | |
| parent | 3efca3996a84f93e6246f211af51f0ff8d539366 (diff) | |
| download | cpython-git-b166ffdc3a8458aaa2585ddbdd33e356e62b5c75.tar.gz | |
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
........
| -rw-r--r-- | Include/descrobject.h | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 2 insertions, 2 deletions
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 *); @@ -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 |