[Python-checkins] r73132 - in python/branches/release30-maint: Objects/frameobject.c

Tue Jun 2 01:35:11 CEST 2009

Author: antoine.pitrou
Date: Tue Jun 2 01:35:11 2009
New Revision: 73132
Log:
Merged revisions 73131 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
 r73131 | antoine.pitrou | 2009年06月02日 01:29:07 +0200 (mar., 02 juin 2009) | 9 lines
 
 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
 ........
................
Modified:
 python/branches/release30-maint/ (props changed)
 python/branches/release30-maint/Objects/frameobject.c
Modified: python/branches/release30-maint/Objects/frameobject.c
==============================================================================

--- python/branches/release30-maint/Objects/frameobject.c	(original)
+++ python/branches/release30-maint/Objects/frameobject.c	Tue Jun 2 01:35:11 2009
@@ -85,6 +85,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 (!PyLong_CheckExact(p_new_lineno)) {
@@ -126,7 +127,8 @@
 	/* Find the bytecode offset for the start of the given line, or the
 	 * first code-owning line after it. */
 	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;
