From 9652baaf448571ff382fdba868b9402fd3b58751 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Tue, 2 May 2006 07:27:47 +0000 Subject: 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. --- Modules/expat/xmlparse.c | 8 ++++---- Modules/expat/xmlrole.c | 4 ++-- Modules/expat/xmltok.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Modules/expat/xmlparse.c b/Modules/expat/xmlparse.c index 3372bc9..42d95b7 100644 --- a/Modules/expat/xmlparse.c +++ b/Modules/expat/xmlparse.c @@ -2,10 +2,6 @@ See the file COPYING for copying permission. */ -#include -#include /* memset(), memcpy() */ -#include - #define XML_BUILDING_EXPAT 1 #ifdef COMPILED_FROM_DSP @@ -16,6 +12,10 @@ #include #endif /* ndef COMPILED_FROM_DSP */ +#include +#include /* memset(), memcpy() */ +#include + #include "expat.h" #ifdef XML_UNICODE diff --git a/Modules/expat/xmlrole.c b/Modules/expat/xmlrole.c index 1924fcb..2587fdf 100644 --- a/Modules/expat/xmlrole.c +++ b/Modules/expat/xmlrole.c @@ -2,8 +2,6 @@ See the file COPYING for copying permission. */ -#include - #ifdef COMPILED_FROM_DSP #include "winconfig.h" #elif defined(MACOS_CLASSIC) @@ -14,6 +12,8 @@ #endif #endif /* ndef COMPILED_FROM_DSP */ +#include + #include "expat_external.h" #include "internal.h" #include "xmlrole.h" diff --git a/Modules/expat/xmltok.c b/Modules/expat/xmltok.c index 160fa40..8b9d997 100644 --- a/Modules/expat/xmltok.c +++ b/Modules/expat/xmltok.c @@ -2,8 +2,6 @@ See the file COPYING for copying permission. */ -#include - #ifdef COMPILED_FROM_DSP #include "winconfig.h" #elif defined(MACOS_CLASSIC) @@ -14,6 +12,8 @@ #endif #endif /* ndef COMPILED_FROM_DSP */ +#include + #include "expat_external.h" #include "internal.h" #include "xmltok.h" -- cgit v0.12