[Python-checkins] r45854 - python/trunk/Modules/expat/xmlparse.c python/trunk/Modules/expat/xmlrole.c python/trunk/Modules/expat/xmltok.c

[neal.norwitz]

Author: neal.norwitz
Date: Tue May  2 09:27:47 2006
New Revision: 45854

Modified:
   python/trunk/Modules/expat/xmlparse.c
   python/trunk/Modules/expat/xmlrole.c
   python/trunk/Modules/expat/xmltok.c
Log:
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.


Modified: python/trunk/Modules/expat/xmlparse.c
==============================================================================
--- python/trunk/Modules/expat/xmlparse.c	(original)
+++ python/trunk/Modules/expat/xmlparse.c	Tue May  2 09:27:47 2006
@@ -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

Modified: python/trunk/Modules/expat/xmlrole.c
==============================================================================
--- python/trunk/Modules/expat/xmlrole.c	(original)
+++ python/trunk/Modules/expat/xmlrole.c	Tue May  2 09:27:47 2006
@@ -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"

Modified: python/trunk/Modules/expat/xmltok.c
==============================================================================
--- python/trunk/Modules/expat/xmltok.c	(original)
+++ python/trunk/Modules/expat/xmltok.c	Tue May  2 09:27:47 2006
@@ -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"