Oops, another forgotten renaming: varobject -> PyVarObject.

diff --git a/Include/object.h b/Include/object.h
index 45bb41ef717b42fe27ff863592a27804fef2f08d..45e0f02d4f630a9f62f2a0bc3e48d472d52b011a 100644 (file)
--- a/Include/object.h
+++ b/Include/object.h
@@ -117,7 +117,7 @@ typedef struct _object {
 
 typedef struct {
        PyObject_VAR_HEAD
-} varobject;
+} PyVarObject;
 
 
 /*

diff --git a/Include/objimpl.h b/Include/objimpl.h
index 5e1fa286dde60b7ba65b8d13f99927f215dad441..77177d079005543294497d9f11c34fa94bc1e850 100644 (file)
--- a/Include/objimpl.h
+++ b/Include/objimpl.h
@@ -56,7 +56,7 @@ n * tp_itemsize.  This fills in the ob_size field as well.
 
 #ifndef MS_COREDLL
 extern PyObject *_PyObject_New Py_PROTO((PyTypeObject *));
-extern varobject *_PyObject_NewVar Py_PROTO((PyTypeObject *, int));
+extern PyVarObject *_PyObject_NewVar Py_PROTO((PyTypeObject *, int));
 
 #define PyObject_NEW(type, typeobj) ((type *) _PyObject_New(typeobj))
 #define PyObject_NEW_VAR(type, typeobj, n) ((type *) _PyObject_NewVar(typeobj, n))
@@ -67,10 +67,10 @@ extern varobject *_PyObject_NewVar Py_PROTO((PyTypeObject *, int));
    no guarantee they will use the same heap
 */
 extern PyObject *_PyObject_New Py_PROTO((PyTypeObject *, PyObject *));
-extern varobject *_PyObject_NewVar Py_PROTO((PyTypeObject *, int, varobject *));
+extern PyVarObject *_PyObject_NewVar Py_PROTO((PyTypeObject *, int, PyVarObject *));
 
 #define PyObject_NEW(type, typeobj) ((type *) _PyObject_New(typeobj,(PyObject *)malloc((typeobj)->tp_basicsize)))
-#define PyObject_NEW_VAR(type, typeobj, n) ((type *) _PyObject_NewVar(typeobj, n, (varobject *)malloc((typeobj)->tp_basicsize + n * (typeobj)->tp_itemsize)))
+#define PyObject_NEW_VAR(type, typeobj, n) ((type *) _PyObject_NewVar(typeobj, n, (PyVarObject *)malloc((typeobj)->tp_basicsize + n * (typeobj)->tp_itemsize)))
 
 #endif /* MS_COREDLL */
 

diff --git a/Include/rename2.h b/Include/rename2.h
index 3489f14cd62f6b4962369297fc39d54a6576b614..b571cd45d2cc037c6c22939c18579e5c64b5ee91 100644 (file)
--- a/Include/rename2.h
+++ b/Include/rename2.h
@@ -115,6 +115,7 @@ PERFORMANCE OF THIS SOFTWARE.
 #define longobject PyLongObject
 #define noobject PyNothingObject
 #define object PyObject
+#define varobject PyVarObject
 #define stringobject PyStringObject
 #define typeobject PyTypeObject
 #define listobject PyListObject

diff --git a/Misc/RENAME b/Misc/RENAME
index fe13dbe6eada62e0f0acb202c2e2c6ab030681d0..6a4f5a0ad46aedb3e7d658820e991eb226047385 100644 (file)
--- a/Misc/RENAME
+++ b/Misc/RENAME
@@ -79,6 +79,7 @@ intobject PyIntObject
 longobject PyLongObject
 noobject PyNothingObject
 object PyObject
+varobject PyVarObject
 stringobject PyStringObject
 typeobject PyTypeObject
 listobject PyListObject

diff --git a/Objects/object.c b/Objects/object.c
index a2198e6cf4e08e36696114934978ff5b4c570032..c4adf9ab633716eb4fc017ae40fe02b1a421c746 100644 (file)
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -129,24 +129,24 @@ _PyObject_New(tp,op)
 }
 
 #ifndef MS_COREDLL
-varobject *
+PyVarObject *
 _PyObject_NewVar(tp, size)
        PyTypeObject *tp;
        int size;
 #else
-varobject *
+PyVarObject *
 _PyObject_NewVar(tp, size, op)
        PyTypeObject *tp;
        int size;
-       varobject *op;
+       PyVarObject *op;
 #endif
 {
 #ifndef MS_COREDLL
-       varobject *op = (varobject *)
+       PyVarObject *op = (PyVarObject *)
                malloc(tp->tp_basicsize + size * tp->tp_itemsize);
 #endif
        if (op == NULL)
-               return (varobject *)PyErr_NoMemory();
+               return (PyVarObject *)PyErr_NoMemory();
        op->ob_type = tp;
        op->ob_size = size;
        _Py_NewReference(op);