diff options
| author | Martin Panter <vadmium> | 2015-08-25 05:25:21 +0000 |
|---|---|---|
| committer | Martin Panter <vadmium> | 2015-08-25 05:25:21 +0000 |
| commit | b661eb5a69fe260d56a5d57a5b9646ea1386a60b (patch) | |
| tree | fac8047fc546a8a76bfd99b09509a18f05a50c1a /Doc/includes | |
| parent | aa0b4a76f2a820fa0d43671eb23b85a7ddabc521 (diff) | |
| parent | fcca311965037a7e5cdf0b42640387b1b069d506 (diff) | |
| download | cpython-b661eb5a69fe260d56a5d57a5b9646ea1386a60b.tar.gz | |
Issue #24808: Merge 3.4 into 3.5; adjust new tp_as_async field
Diffstat (limited to 'Doc/includes')
| -rw-r--r-- | Doc/includes/typestruct.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Doc/includes/typestruct.h b/Doc/includes/typestruct.h index 5c9f8f5d9f..50c46217bc 100644 --- a/Doc/includes/typestruct.h +++ b/Doc/includes/typestruct.h @@ -1,7 +1,7 @@ typedef struct _typeobject { PyObject_VAR_HEAD - char *tp_name; /* For printing, in format "<module>.<name>" */ - int tp_basicsize, tp_itemsize; /* For allocation */ + const char *tp_name; /* For printing, in format "<module>.<name>" */ + Py_ssize_t tp_basicsize, tp_itemsize; /* For allocation */ /* Methods to implement standard operations */ @@ -9,7 +9,7 @@ typedef struct _typeobject { printfunc tp_print; getattrfunc tp_getattr; setattrfunc tp_setattr; - PyAsyncMethods *tp_as_async; + PyAsyncMethods *tp_as_async; /* formerly known as tp_compare or tp_reserved */ reprfunc tp_repr; /* Method suites for standard classes */ @@ -30,9 +30,9 @@ typedef struct _typeobject { PyBufferProcs *tp_as_buffer; /* Flags to define presence of optional/expanded features */ - long tp_flags; + unsigned long tp_flags; - char *tp_doc; /* Documentation string */ + const char *tp_doc; /* Documentation string */ /* call function for all accessible objects */ traverseproc tp_traverse; @@ -44,7 +44,7 @@ typedef struct _typeobject { richcmpfunc tp_richcompare; /* weak reference enabler */ - long tp_weaklistoffset; + Py_ssize_t tp_weaklistoffset; /* Iterators */ getiterfunc tp_iter; @@ -58,7 +58,7 @@ typedef struct _typeobject { PyObject *tp_dict; descrgetfunc tp_descr_get; descrsetfunc tp_descr_set; - long tp_dictoffset; + Py_ssize_t tp_dictoffset; initproc tp_init; allocfunc tp_alloc; newfunc tp_new; @@ -69,7 +69,6 @@ typedef struct _typeobject { PyObject *tp_cache; PyObject *tp_subclasses; PyObject *tp_weaklist; - destructor tp_del; /* Type attribute cache version tag. Added in version 2.6 */ |