Fix breakage from patch 1471883 (r45800 & r45808) on OSF/1.

The problem was that pyconfig.h was being included before some system headers
which caused redefinitions and other breakage.  This moves system headers
after expat_config.h which includes pyconfig.h.

diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c
index 3372bc962ee13f2d4d43635ceb07401c132d5d3e..42d95b7bc42706e63fd38ce14b621c7e26f90d1c 100644 (file)
--- a/Modules/expat/xmlparse.c
+++ b/Modules/expat/xmlparse.c
@@ -2,10 +2,6 @@
    See the file COPYING for copying permission.
 */
 
-#include <stddef.h>
-#include <string.h>                     /* memset(), memcpy() */
-#include <assert.h>
-
 #define XML_BUILDING_EXPAT 1
 
 #ifdef COMPILED_FROM_DSP
@@ -16,6 +12,10 @@
 #include <expat_config.h>
 #endif /* ndef COMPILED_FROM_DSP */
 
+#include <stddef.h>
+#include <string.h>                     /* memset(), memcpy() */
+#include <assert.h>
+
 #include "expat.h"
 
 #ifdef XML_UNICODE

diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c
index 1924fcb4dbe243ed7d474cdd450de7ca937dba4b..2587fdf7276493dca97bb03b2c8b6cbd2fe11d16 100644 (file)
--- a/Modules/expat/xmlrole.c
+++ b/Modules/expat/xmlrole.c
@@ -2,8 +2,6 @@
    See the file COPYING for copying permission.
 */
 
-#include <stddef.h>
-
 #ifdef COMPILED_FROM_DSP
 #include "winconfig.h"
 #elif defined(MACOS_CLASSIC)
@@ -14,6 +12,8 @@
 #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 160fa4003ab4effa9065777eb01f4d01fdf66184..8b9d99738e5aee32dc0e924f73c70dd13e4edab7 100644 (file)
--- a/Modules/expat/xmltok.c
+++ b/Modules/expat/xmltok.c
@@ -2,8 +2,6 @@
    See the file COPYING for copying permission.
 */
 
-#include <stddef.h>
-
 #ifdef COMPILED_FROM_DSP
 #include "winconfig.h"
 #elif defined(MACOS_CLASSIC)
@@ -14,6 +12,8 @@
 #endif
 #endif /* ndef COMPILED_FROM_DSP */
 
+#include <stddef.h>
+
 #include "expat_external.h"
 #include "internal.h"
 #include "xmltok.h"