summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-03-26 23:25:24 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-03-26 23:25:24 (GMT)
commit3a932128246bccd4a9c3fc3ae056341e1b1068e0 (patch)
tree42b2fc6d7d34f6eda8937015d6440d809a56973c
parentb1b3efc5049472829f586a57aa248afc131759cf (diff)
downloadcpython-3a932128246bccd4a9c3fc3ae056341e1b1068e0.zip
cpython-3a932128246bccd4a9c3fc3ae056341e1b1068e0.tar.gz
cpython-3a932128246bccd4a9c3fc3ae056341e1b1068e0.tar.bz2
Merged revisions 61958-61959 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r61958 | amaury.forgeotdarc | 2008-03-27 00:07:43 +0100 (Thu, 27 Mar 2008) | 2 lines C89 compliance: Microsoft compilers want variable declarations at the top ........
-rw-r--r--Python/pythonrun.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 08091b7..74e3430 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1586,8 +1586,7 @@ PyParser_ASTFromString(const char *s, const char *filename, int start,
{
mod_ty mod;
perrdetail err;
- int iflags;
- iflags = PARSER_FLAGS(flags);
+ int iflags = PARSER_FLAGS(flags);
node *n = PyParser_ParseStringFlagsFilenameEx(s, filename,
&_PyParser_Grammar, start, &err,
@@ -1614,9 +1613,8 @@ PyParser_ASTFromFile(FILE *fp, const char *filename, const char* enc,
{
mod_ty mod;
perrdetail err;
- int iflags;
+ int iflags = PARSER_FLAGS(flags);
- iflags = PARSER_FLAGS(flags);
node *n = PyParser_ParseFileFlagsEx(fp, filename, enc,
&_PyParser_Grammar,
start, ps1, ps2, &err, &iflags);