diff Include/stringobject.h @ 44351:86a2679dca46

#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT.
author Christian Heimes <christian@cheimes.de>
date Wed, 19 Dec 2007 02:45:37 +0000
parents 444da08f78a4
children ef4ec968fdb6
line wrap: on
line diff
--- a/Include/stringobject.h	Wed Dec 19 02:07:34 2007 +0000
+++ b/Include/stringobject.h	Wed Dec 19 02:45:37 2007 +0000
@@ -43,8 +43,8 @@
 PyAPI_DATA(PyTypeObject) PyStringIter_Type;
 
 #define PyString_Check(op) \
-                 PyType_FastSubclass(Py_Type(op), Py_TPFLAGS_STRING_SUBCLASS)
-#define PyString_CheckExact(op) (Py_Type(op) == &PyString_Type)
+                 PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_STRING_SUBCLASS)
+#define PyString_CheckExact(op) (Py_TYPE(op) == &PyString_Type)
 
 PyAPI_FUNC(PyObject *) PyString_FromStringAndSize(const char *, Py_ssize_t);
 PyAPI_FUNC(PyObject *) PyString_FromString(const char *);
@@ -68,7 +68,7 @@
 /* Macro, trading safety for speed */
 #define PyString_AS_STRING(op) (assert(PyString_Check(op)), \
                                 (((PyStringObject *)(op))->ob_sval))
-#define PyString_GET_SIZE(op)  (assert(PyString_Check(op)),Py_Size(op))
+#define PyString_GET_SIZE(op)  (assert(PyString_Check(op)),Py_SIZE(op))
 
 /* _PyString_Join(sep, x) is like sep.join(x).  sep must be PyStringObject*,
    x must be an iterable object. */