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

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 08091b7939a698a9de093315df51b1bb7ec2ee0f..74e3430e9722a88c16fa90973afb96959edfad34 100644 (file)
--- 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);