summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2009-06-01 23:29:07 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2009-06-01 23:29:07 (GMT)
commitb7ffad5b2837a3730a560d476487c1e10461cf7b (patch)
tree2e5b3ccc9158c4f63c68e6198f722c47400a52d7
parent8cc7d88bbcae32e5b7e12b0c4cfe34de2cff8166 (diff)
downloadcpython-b7ffad5b2837a3730a560d476487c1e10461cf7b.zip
cpython-b7ffad5b2837a3730a560d476487c1e10461cf7b.tar.gz
cpython-b7ffad5b2837a3730a560d476487c1e10461cf7b.tar.bz2
Merged revisions 73129 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r73129 | antoine.pitrou | 2009-06-02 01:23:16 +0200 (mar., 02 juin 2009) | 3 lines Fix compilation error with gcc 4.3.2 ........
-rw-r--r--Objects/frameobject.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index a494992..664dc2b 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -130,8 +130,10 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno)
else {
/* Find the bytecode offset for the start of the given
* line, or the first code-owning line after it. */
+ char *tmp;
PyBytes_AsStringAndSize(f->f_code->co_lnotab,
- &(char*)lnotab, &lnotab_len);
+ &tmp, &lnotab_len);
+ lnotab = (unsigned char *) tmp;
addr = 0;
line = f->f_code->co_firstlineno;
new_lasti = -1;