summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2020-01-15 17:07:09 (GMT)
committerGitHub <noreply@github.com>2020-01-15 17:07:09 (GMT)
commit92135775ce12fd71f0878c0a8a0652c197fcc60b (patch)
treee76b8090dd41dcabc4c26d7a611a6e5c9b0b9eb4 /Python
parent9f220e4968cf73fa60440120ee46881e7974e47d (diff)
downloadcpython-92135775ce12fd71f0878c0a8a0652c197fcc60b.zip
cpython-92135775ce12fd71f0878c0a8a0652c197fcc60b.tar.gz
cpython-92135775ce12fd71f0878c0a8a0652c197fcc60b.tar.bz2
Fix compiler warning on Windows (GH-18012)
Python-ast.h contains a macro named Yield that conflicts with the Yield macro in Windows system headers. While Python-ast.h has an "undef Yield" directive to prevent this, it means that Python-ast.h must be included before Windows header files or we run into a re-declaration warning. In commit c96be811fa7d an include for pycore_pystate.h was added which indirectly includes Windows header files. In this commit we re-order the includes to fix this warning. (cherry picked from commit e92d39303feb1d3b4194c6a8275b1fc63b2153b2) Co-authored-by: Ammar Askar <ammar@ammaraskar.com>
Diffstat (limited to 'Python')
-rw-r--r--Python/compile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/compile.c b/Python/compile.c
index f09e99f..11974c3 100644
--- a/Python/compile.c
+++ b/Python/compile.c
@@ -23,8 +23,8 @@
#include "Python.h"
-#include "Python-ast.h"
#include "pycore_pystate.h" /* _PyInterpreterState_GET_UNSAFE() */
+#include "Python-ast.h"
#include "ast.h"
#include "code.h"
#include "symtable.h"