summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2016-06-13 23:41:40 -0700
committerBenjamin Peterson <benjamin@python.org>2016-06-13 23:41:40 -0700
commit11a693d3304eb896de35733848b5bd9f2b5b4ab5 (patch)
tree0357fd4f94f5f8fd16f050bf8c77b619504b29e2
parent056f76d9782d54d069b7f6e967705f6fec4b4935 (diff)
parent06d49bb89584921d17f3309530fc9544ef5b88c3 (diff)
downloadcpython-git-11a693d3304eb896de35733848b5bd9f2b5b4ab5.tar.gz
merge 3.4
-rw-r--r--Modules/expat/xmlrole.c4
-rw-r--r--Modules/expat/xmltok.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c
index 9a8f85dd25..44772e21dd 100644
--- a/Modules/expat/xmlrole.c
+++ b/Modules/expat/xmlrole.c
@@ -2,6 +2,8 @@
See the file COPYING for copying permission.
*/
+#include <stddef.h>
+
#ifdef COMPILED_FROM_DSP
#include "winconfig.h"
#elif defined(MACOS_CLASSIC)
@@ -16,8 +18,6 @@
#endif
#endif /* ndef COMPILED_FROM_DSP */
-#include <stddef.h>
-
#include "expat_external.h"
#include "internal.h"
#include "xmlrole.h"
diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c
index 205c07eb84..bf09dfc72b 100644
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -2,6 +2,8 @@
See the file COPYING for copying permission.
*/
+#include <stddef.h>
+
#ifdef COMPILED_FROM_DSP
#include "winconfig.h"
#elif defined(MACOS_CLASSIC)
@@ -16,8 +18,6 @@
#endif
#endif /* ndef COMPILED_FROM_DSP */
-#include <stddef.h>
-
#include "expat_external.h"
#include "internal.h"
#include "xmltok.h"