diff options
| -rw-r--r-- | Include/object.h | 2 | ||||
| -rw-r--r-- | Include/objimpl.h | 6 | ||||
| -rw-r--r-- | Include/rename2.h | 1 | ||||
| -rw-r--r-- | Misc/RENAME | 1 | ||||
| -rw-r--r-- | Objects/object.c | 10 |
5 files changed, 11 insertions, 9 deletions
diff --git a/Include/object.h b/Include/object.h index 45bb41e..45e0f02 100644 --- 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 5e1fa28..77177d0 100644 --- 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 3489f14..b571cd4 100644 --- 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 fe13dbe..6a4f5a0 100644 --- 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 a2198e6..c4adf9a 100644 --- 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); |