]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Fix compiler warning on Windows (GH-18012)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Wed, 15 Jan 2020 17:07:09 +0000 (09:07 -0800)
committerGitHub <noreply@github.com>
Wed, 15 Jan 2020 17:07:09 +0000 (09:07 -0800)
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>
Python/compile.c

index f09e99fd4a43d3c9af424522ce3b8167db47e56d..11974c3509a32cf89abf59a87212f5cb15dcd714 100644 (file)
@@ -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"