commit 5d7428b8ce0ffc79b24b05df2b3d2865db037902
author Martin v. Löwis <martin@v.loewis.de> Sat Jul 21 18:47:48 2007 +0000
committer Martin v. Löwis <martin@v.loewis.de> Sat Jul 21 18:47:48 2007 +0000
tree c673d91d8fe112d194cb9bbf45006b8b35838965
parent 9f2e346911988cda95fec7c901e8d10d34fa9563

Fix merge breakage.

Include/stringobject.h

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 @@
 
 /* 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. */