From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Mon, 10 Dec 2018 15:41:11 +0000 (-0800)
Subject: bpo-31374: expat doesn't include <pyconfig.h> on Windows (GH-11079)
X-Git-Tag: v3.6.8rc1~15
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3acf30de90936fe3714bb62873e2523c0440e652;p=thirdparty%2FPython%2Fcpython.git

bpo-31374: expat doesn't include <pyconfig.h> on Windows (GH-11079)

(cherry picked from commit b6ef6f69a9afc979640a5f9883f799de1364bff7)

Co-authored-by: Victor Stinner <vstinner@redhat.com>
---

diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c
index fa35de71324c..6371a350dadf 100644
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -30,7 +30,9 @@
    USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
-#include <pyconfig.h>
+#if !defined(_WIN32) && defined(HAVE_EXPAT_CONFIG_H)
+#  include <pyconfig.h>
+#endif
 #include <stddef.h>
 #include <string.h>  /* memcpy */