[Python-checkins] bpo-37731: Reorder includes in xmltok.c to avoid redefinition of _POSIX_C_SOURCE (GH-16733)

Miss Islington (bot) webhook-mailer at python.org
Thu Nov 7 00:10:14 EST 2019


https://github.com/python/cpython/commit/30114c7119a9ae0e610d6974f57f22d8d05ed50d
commit: 30114c7119a9ae0e610d6974f57f22d8d05ed50d
branch: 2.7
author: Miss Islington (bot) <31488909+miss-islington at users.noreply.github.com>
committer: GitHub <noreply at github.com>
date: 2019-11-06T21:10:05-08:00
summary:

bpo-37731: Reorder includes in xmltok.c to avoid redefinition of _POSIX_C_SOURCE (GH-16733)

(cherry picked from commit 8177404d520e81f16324a900f093adf3856d33f8)

Co-authored-by: Pablo Galindo <Pablogsal at gmail.com>

files:
M Modules/expat/xmltok.c

diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c
index 11e9d1ccdad42..54cfedb85c28c 100644
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -30,6 +30,14 @@
    USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
+#ifdef _WIN32
+#  include "winconfig.h"
+#else
+#  ifdef HAVE_EXPAT_CONFIG_H
+#    include <expat_config.h>
+#  endif
+#endif /* ndef _WIN32 */
+
 #include <stddef.h>
 #include <string.h> /* memcpy */
 
@@ -42,14 +50,6 @@
 #  include <stdbool.h>
 #endif
 
-#ifdef _WIN32
-#  include "winconfig.h"
-#else
-#  ifdef HAVE_EXPAT_CONFIG_H
-#    include <expat_config.h>
-#  endif
-#endif /* ndef _WIN32 */
-
 #include "expat_external.h"
 #include "internal.h"
 #include "xmltok.h"



More information about the Python-checkins mailing list