Bug #1432350: arrayobject should use PyObject_VAR_HEAD

diff --git a/Doc/api/newtypes.tex b/Doc/api/newtypes.tex
index a95f8361115e4ded7be94bd37d9dc7b83fa73fe5..bfce26c9b782de59a6064520cdbb932bb2b5a722 100644 (file)
--- a/Doc/api/newtypes.tex
+++ b/Doc/api/newtypes.tex
@@ -188,7 +188,7 @@ These macros are used in the definition of \ctype{PyObject} and
   instance.  This macro always expands to:
   \begin{verbatim}
     PyObject_HEAD
-    int ob_size;
+    Py_ssize_t ob_size;
   \end{verbatim}
   Note that \csimplemacro{PyObject_HEAD} is part of the expansion, and
   that its own expansion varies depending on the definition of

diff --git a/Modules/arraymodule.c b/Modules/arraymodule.c
index dffb2e71e0dc016c0c7dae9a0db234bd988a2189..4152baddf129b8c995a187dba74f93c94a975f86 100644 (file)
--- a/Modules/arraymodule.c
+++ b/Modules/arraymodule.c
@@ -29,8 +29,7 @@ struct arraydescr {
 };
 
 typedef struct arrayobject {
-       PyObject_HEAD
-       Py_ssize_t ob_size;
+       PyObject_VAR_HEAD
        char *ob_item;
        Py_ssize_t allocated;
        struct arraydescr *ob_descr;