summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-08-25 23:17:42 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-08-25 23:17:42 (GMT)
commit6f3d6a9b2369dd68970bd47e85b27ee624580aaa (patch)
tree1156038e11f1d7c04f57ea525056306107e715ad /Objects
parent7c4bf55ffdc9d88795381d5d0fb5481f226a9d57 (diff)
downloadcpython-6f3d6a9b2369dd68970bd47e85b27ee624580aaa.zip
cpython-6f3d6a9b2369dd68970bd47e85b27ee624580aaa.tar.gz
cpython-6f3d6a9b2369dd68970bd47e85b27ee624580aaa.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 493987a..d262168 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -188,8 +188,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},