From: Antoine Pitrou <solipsis@pitrou.net>
Date: Mon, 1 Jun 2009 23:27:15 +0000 (+0000)
Subject: Merged revisions 73129 via svnmerge from
X-Git-Tag: v2.6.3rc1~222
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a241917e3f12fa3c3e3a6282601896b3fcf66f12;p=python

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
........
---

diff --git a/Objects/frameobject.c b/Objects/frameobject.c
index f8c5764001..fa7a6fd860 100644
--- a/Objects/frameobject.c
+++ b/Objects/frameobject.c
@@ -86,6 +86,7 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno)
 	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 @@ frame_setlineno(PyFrameObject *f, PyObject* p_new_lineno)
 	/* 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;