summaryrefslogtreecommitdiffstats
path: root/Doc/c-api/memory.rst
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-06-02 19:57:10 (GMT)
committerVictor Stinner <victor.stinner@gmail.com>2014-06-02 19:57:10 (GMT)
commitd8f0d922d53a8f7bb64c1fda26be386bd2e3d958 (patch)
tree66af4790c65423eb30cf83fbb35c06a3192bc55e /Doc/c-api/memory.rst
parentaa0e7afa438d7586353a3338fd350449714e117a (diff)
downloadcpython-d8f0d922d53a8f7bb64c1fda26be386bd2e3d958.zip
cpython-d8f0d922d53a8f7bb64c1fda26be386bd2e3d958.tar.gz
cpython-d8f0d922d53a8f7bb64c1fda26be386bd2e3d958.tar.bz2
Issue #21233: Rename the C structure "PyMemAllocator" to "PyMemAllocatorEx" to
make sure that the code using it will be adapted for the new "calloc" field (instead of crashing).
Diffstat (limited to 'Doc/c-api/memory.rst')
-rw-r--r--Doc/c-api/memory.rst10
1 files changed, 6 insertions, 4 deletions
diff --git a/Doc/c-api/memory.rst b/Doc/c-api/memory.rst
index ec5f691..5d78f38 100644
--- a/Doc/c-api/memory.rst
+++ b/Doc/c-api/memory.rst
@@ -232,7 +232,7 @@ Customize Memory Allocators
.. versionadded:: 3.4
-.. c:type:: PyMemAllocator
+.. c:type:: PyMemAllocatorEx
Structure used to describe a memory block allocator. The structure has
four fields:
@@ -253,7 +253,9 @@ Customize Memory Allocators
+----------------------------------------------------------+---------------------------------------+
.. versionchanged:: 3.5
- Add a new field ``calloc``.
+ The :c:type:`PyMemAllocator` structure was renamed to
+ :c:type:`PyMemAllocatorEx` and a new ``calloc`` field was added.
+
.. c:type:: PyMemAllocatorDomain
@@ -267,12 +269,12 @@ Customize Memory Allocators
:c:func:`PyObject_Realloc` and :c:func:`PyObject_Free`
-.. c:function:: void PyMem_GetAllocator(PyMemAllocatorDomain domain, PyMemAllocator *allocator)
+.. c:function:: void PyMem_GetAllocator(PyMemAllocatorDomain domain, PyMemAllocatorEx *allocator)
Get the memory block allocator of the specified domain.
-.. c:function:: void PyMem_SetAllocator(PyMemAllocatorDomain domain, PyMemAllocator *allocator)
+.. c:function:: void PyMem_SetAllocator(PyMemAllocatorDomain domain, PyMemAllocatorEx *allocator)
Set the memory block allocator of the specified domain.