#5360: replace PyObject_HEAD_INIT by PyVarObject_HEAD_INIT.

diff --git a/Doc/extending/newtypes.rst b/Doc/extending/newtypes.rst
index 5264a8751d245406b15b45050cf65c5bd52fdab0..c20e96f58910deb6df50db3d0e470fe0fc5954fd 100644 (file)
--- a/Doc/extending/newtypes.rst
+++ b/Doc/extending/newtypes.rst
@@ -72,7 +72,7 @@ Python floats::
 Moving on, we come to the crunch --- the type object. ::
 
    static PyTypeObject noddy_NoddyType = {
-       PyObject_HEAD_INIT(NULL)
+       PyVarObject_HEAD_INIT(NULL, 0)
        "noddy.Noddy",             /* tp_name */
        sizeof(noddy_NoddyObject), /* tp_basicsize */
        0,                         /* tp_itemsize */
@@ -103,11 +103,11 @@ it's common practice to not specify them explicitly unless you need them.
 This is so important that we're going to pick the top of it apart still
 further::
 
-   PyObject_HEAD_INIT(NULL)
+   PyVarObject_HEAD_INIT(NULL, 0)
 
 This line is a bit of a wart; what we'd like to write is::
 
-   PyObject_HEAD_INIT(&PyType_Type)
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
 
 as the type of a type object is "type", but this isn't strictly conforming C and
 some compilers complain.  Fortunately, this member will be filled in for us by
@@ -1427,7 +1427,7 @@ type is defined with the following structure::
 The statically-declared type object for instances is defined this way::
 
    PyTypeObject PyInstance_Type = {
-       PyObject_HEAD_INIT(&PyType_Type)
+       PyVarObject_HEAD_INIT(&PyType_Type, 0)
        0,
        "module.instance",
 

diff --git a/Doc/extending/windows.rst b/Doc/extending/windows.rst
index 29e9e1ecf15d7434b4d6f90406e1ffdf1cb65220..8d1986ff493432942ed98f47e90f2dfe07677142 100644 (file)
--- a/Doc/extending/windows.rst
+++ b/Doc/extending/windows.rst
@@ -169,11 +169,11 @@ described here are distributed with the Python sources in the
 
 If your module creates a new type, you may have trouble with this line::
 
-   PyObject_HEAD_INIT(&PyType_Type)
+   PyVarObject_HEAD_INIT(&PyType_Type, 0)
 
 Change it to::
 
-   PyObject_HEAD_INIT(NULL)
+   PyVarObject_HEAD_INIT(NULL, 0)
 
 and add the following to the module initialization function::