[Python-checkins] cpython (merge 3.5 -> default): merge 3.5

[benjamin.peterson]

https://hg.python.org/cpython/rev/264bf2551038
changeset:   102011:264bf2551038
parent:      102008:820d21c97d66
parent:      102010:376a379f12fe
user:        Benjamin Peterson <benjamin at python.org>
date:        Mon Jun 13 23:43:40 2016 -0700
summary:
  merge 3.5

files:
  Modules/expat/xmlrole.c |  4 ++--
  Modules/expat/xmltok.c  |  4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)


diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c
--- 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
--- 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"

-- 
Repository URL: https://hg.python.org/cpython