Mercurial > cpython-lru_cache-weakref
diff Include/stringobject.h @ 42335:c8b850b5a066
Fix merge breakage.
| author | Martin v. Löwis <martin@v.loewis.de> |
|---|---|
| date | Sat, 21 Jul 2007 18:47:48 +0000 |
| parents | e70cdce0e8b2 |
| children | ace45b361e87 |
line wrap: on
line diff
--- a/Include/stringobject.h Sat Jul 21 17:22:18 2007 +0000 +++ b/Include/stringobject.h Sat Jul 21 18:47:48 2007 +0000 @@ -85,7 +85,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)),(((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. */