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
........
This commit is contained in:
Antoine Pitrou 2009-06-01 23:27:15 +00:00
parent 058c9aae43
commit a241917e3f
1 changed files with 3 additions and 1 deletions

View File

@ -86,6 +86,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno)
int in_finally[CO_MAXBLOCKS]; /* (ditto) */ int in_finally[CO_MAXBLOCKS]; /* (ditto) */
int blockstack_top = 0; /* (ditto) */ int blockstack_top = 0; /* (ditto) */
unsigned char setup_op = 0; /* (ditto) */ unsigned char setup_op = 0; /* (ditto) */
char *tmp;
/* f_lineno must be an integer. */ /* f_lineno must be an integer. */
if (!PyInt_Check(p_new_lineno)) { if (!PyInt_Check(p_new_lineno)) {
@ -115,7 +116,8 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno)
/* Find the bytecode offset for the start of the given line, or the /* Find the bytecode offset for the start of the given line, or the
* first code-owning line after it. */ * first code-owning line after it. */
PyString_AsStringAndSize(f->f_code->co_lnotab, PyString_AsStringAndSize(f->f_code->co_lnotab,
&(char*)lnotab, &lnotab_len); &tmp, &lnotab_len);
lnotab = (unsigned char *) tmp;
addr = 0; addr = 0;
line = f->f_code->co_firstlineno; line = f->f_code->co_firstlineno;
new_lasti = -1; new_lasti = -1;