summaryrefslogtreecommitdiff
path: root/Include/stringobject.h
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2007-12-19 02:37:44 +0000
committerChristian Heimes <christian@cheimes.de>2007-12-19 02:37:44 +0000
commit313c52225f6d34857203468bc0b431ff46195e1d (patch)
tree1ac4cf6d4292744b963ab4cfe62b4b42e1901ba6 /Include/stringobject.h
parent4550ac1ac308a43c60070fc51dc68d1d054f51b5 (diff)
downloadcpython-313c52225f6d34857203468bc0b431ff46195e1d.tar.gz
#1629: Renamed Py_Size, Py_Type and Py_Refcnt to Py_SIZE, Py_TYPE and Py_REFCNT. Macros for b/w compatibility are available.
Diffstat (limited to 'Include/stringobject.h')
-rw-r--r--Include/stringobject.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Include/stringobject.h b/Include/stringobject.h
index cc7946235c..e3f880a066 100644
--- a/Include/stringobject.h
+++ b/Include/stringobject.h
@@ -56,8 +56,8 @@ PyAPI_DATA(PyTypeObject) PyBaseString_Type;
PyAPI_DATA(PyTypeObject) PyString_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 *);
@@ -89,7 +89,7 @@ PyAPI_FUNC(void) _Py_ReleaseInternedStrings(void);
/* Macro, trading safety for speed */
#define PyString_AS_STRING(op) (((PyStringObject *)(op))->ob_sval)
-#define PyString_GET_SIZE(op) Py_Size(op)
+#define PyString_GET_SIZE(op) Py_SIZE(op)
/* _PyString_Join(sep, x) is like sep.join(x). sep must be PyStringObject*,
x must be an iterable object. */