Oops, another forgotten renaming: varobject -> PyVarObject.

Include/object.h

@@ -117,7 +117,7 @@ typedef struct _object {
 
 typedef struct {
 	PyObject_VAR_HEAD
-} varobject;
+} PyVarObject;
 
 
 /*

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 */
 

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

Misc/RENAME

@@ -79,6 +79,7 @@ intobject PyIntObject
 longobject PyLongObject
 noobject PyNothingObject
 object PyObject
+varobject PyVarObject
 stringobject PyStringObject
 typeobject PyTypeObject
 listobject PyListObject

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);