diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 18:47:48 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2007-07-21 18:47:48 (GMT) |
| commit | 5d7428b8ce0ffc79b24b05df2b3d2865db037902 (patch) | |
| tree | c673d91d8fe112d194cb9bbf45006b8b35838965 /Include | |
| parent | 9f2e346911988cda95fec7c901e8d10d34fa9563 (diff) | |
| download | cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.zip cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.tar.gz cpython-5d7428b8ce0ffc79b24b05df2b3d2865db037902.tar.bz2 | |
Fix merge breakage.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/bytesobject.h | 2 | ||||
| -rw-r--r-- | Include/stringobject.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Include/bytesobject.h b/Include/bytesobject.h index a649d39..f1e01d1 100644 --- a/Include/bytesobject.h +++ b/Include/bytesobject.h @@ -42,7 +42,7 @@ PyAPI_FUNC(int) PyBytes_Resize(PyObject *, Py_ssize_t); /* Macros, trading safety for speed */ #define PyBytes_AS_STRING(self) (assert(PyBytes_Check(self)),((PyBytesObject *)(self))->ob_bytes) -#define PyBytes_GET_SIZE(self) (assert(PyBytes_Check(self)),((PyBytesObject *)(self))->ob_size) +#define PyBytes_GET_SIZE(self) (assert(PyBytes_Check(self)),Py_Size(self)) #ifdef __cplusplus } diff --git a/Include/stringobject.h b/Include/stringobject.h index 1d932ff..c6ae1a8 100644 --- a/Include/stringobject.h +++ b/Include/stringobject.h @@ -85,7 +85,7 @@ PyAPI_FUNC(void) _Py_ReleaseInternedStrings(void); /* 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)),(((PyStringObject *)(op))->ob_size)) +#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. */ |