Move 'em undefs after #include <pyconfig.h> after all

Author: StanFromIreland

Modules/Setup

@@ -348,7 +348,7 @@ _symtable symtablemodule.c
 # Interface to the Expat XML parser
 # More information on Expat can be found at www.libexpat.org.
 #
-#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DXML_POOR_ENTROPY -UHAVE_ARC4RANDOM -UHAVE_ARC4RANDOM_BUF -UHAVE_GETENTROPY -UHAVE_GETRANDOM -UHAVE_SYSCALL_GETRANDOM -DUSE_PYEXPAT_CAPI
+#pyexpat expat/xmlparse.c expat/xmlrole.c expat/xmltok.c pyexpat.c -I$(srcdir)/Modules/expat -DHAVE_EXPAT_CONFIG_H -DXML_POOR_ENTROPY -DUSE_PYEXPAT_CAPI
 
 # Hye-Shik Chang's CJKCodecs
 

Modules/expat/expat_config.h

@@ -19,4 +19,10 @@
 #define XML_GE 1
 #define XML_CONTEXT_BYTES 1024
 
+#undef HAVE_ARC4RANDOM
+#undef HAVE_ARC4RANDOM_BUF
+#undef HAVE_GETENTROPY
+#undef HAVE_GETRANDOM
+#undef HAVE_SYSCALL_GETRANDOM
+
 #endif /* EXPAT_CONFIG_H */

setup.py

@@ -1773,7 +1773,6 @@ def detect_expat_elementtree(self):
         if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"):
             expat_inc = []
             define_macros = []
-            undef_macros = []
             extra_compile_args = []
             expat_lib = ['expat']
             expat_sources = []
@@ -1786,13 +1785,6 @@ def detect_expat_elementtree(self):
                 # call XML_SetHashSalt(), expat entropy sources are not needed
                 ('XML_POOR_ENTROPY', '1'),
             ]
-            undef_macros = [
-                'HAVE_ARC4RANDOM',
-                'HAVE_ARC4RANDOM_BUF',
-                'HAVE_GETENTROPY',
-                'HAVE_GETRANDOM',
-                'HAVE_SYSCALL_GETRANDOM',
-            ]
             extra_compile_args = []
             # bpo-44394: libexpat uses isnan() of math.h and needs linkage
             # against the libm
@@ -1821,7 +1813,6 @@ def detect_expat_elementtree(self):
 
         self.add(Extension('pyexpat',
                            define_macros=define_macros,
-                           undef_macros=undef_macros,
                            extra_compile_args=extra_compile_args,
                            include_dirs=expat_inc,
                            libraries=expat_lib,
@@ -1835,7 +1826,6 @@ def detect_expat_elementtree(self):
             define_macros.append(('USE_PYEXPAT_CAPI', None))
             self.add(Extension('_elementtree',
                                define_macros=define_macros,
-                               undef_macros=undef_macros,
                                include_dirs=expat_inc,
                                libraries=expat_lib,
                                sources=['_elementtree.c'],