Mercurial > cpython-lru_cache-weakref
diff Objects/frameobject.c @ 54506:db88a67e38ee 2.6
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
........
| author | Antoine Pitrou <solipsis@pitrou.net> |
|---|---|
| date | Mon, 01 Jun 2009 23:27:15 +0000 |
| parents | a563bcf1a62d |
| children | e38335d4df91 |
line wrap: on
line diff
--- a/Objects/frameobject.c Mon Jun 01 22:23:22 2009 +0000 +++ b/Objects/frameobject.c Mon Jun 01 23:27:15 2009 +0000 @@ -86,6 +86,7 @@ int in_finally[CO_MAXBLOCKS]; /* (ditto) */ int blockstack_top = 0; /* (ditto) */ unsigned char setup_op = 0; /* (ditto) */ + char *tmp; /* f_lineno must be an integer. */ if (!PyInt_Check(p_new_lineno)) { @@ -115,7 +116,8 @@ /* Find the bytecode offset for the start of the given line, or the * first code-owning line after it. */ PyString_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;