summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-08-25 23:19:30 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-08-25 23:19:30 (GMT)
commit039d0a00c82fa451bc837bc4561e855d36934074 (patch)
tree62b7d093879f425b56c39916d1932228fcaea467 /Objects
parent1061f18bebb808c95cde8c8a0a7d55e7ed87dbc6 (diff)
downloadcpython-039d0a00c82fa451bc837bc4561e855d36934074.zip
cpython-039d0a00c82fa451bc837bc4561e855d36934074.tar.gz
cpython-039d0a00c82fa451bc837bc4561e855d36934074.tar.bz2
Merged revisions 84320 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r84320 | benjamin.peterson | 2010-08-25 18:13:17 -0500 (Wed, 25 Aug 2010) | 1 line basicsize and itemsize are Py_ssize_t #9688 ........
Diffstat (limited to 'Objects')
-rw-r--r--Objects/typeobject.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index 3bf4e90..d2124f1 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -189,8 +189,8 @@ assign_version_tag(PyTypeObject *type)
static PyMemberDef type_members[] = {
- {"__basicsize__", T_INT, offsetof(PyTypeObject,tp_basicsize),READONLY},
- {"__itemsize__", T_INT, offsetof(PyTypeObject, tp_itemsize), READONLY},
+ {"__basicsize__", T_PYSSIZET, offsetof(PyTypeObject,tp_basicsize),READONLY},
+ {"__itemsize__", T_PYSSIZET, offsetof(PyTypeObject, tp_itemsize), READONLY},
{"__flags__", T_LONG, offsetof(PyTypeObject, tp_flags), READONLY},
{"__weakrefoffset__", T_LONG,
offsetof(PyTypeObject, tp_weaklistoffset), READONLY},