diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-05-02 07:27:47 +0000 |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-05-02 07:27:47 +0000 |
| commit | 9652baaf448571ff382fdba868b9402fd3b58751 (patch) | |
| tree | 42d23f2781cd6941808f1ef105c126ce633136b5 /Modules/expat | |
| parent | 017e68c413be6262eb1e71b0f0c5676d6db33a43 (diff) | |
| download | cpython-git-9652baaf448571ff382fdba868b9402fd3b58751.tar.gz | |
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.
Diffstat (limited to 'Modules/expat')
| -rw-r--r-- | Modules/expat/xmlparse.c | 8 | ||||
| -rw-r--r-- | Modules/expat/xmlrole.c | 4 | ||||
| -rw-r--r-- | 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 3372bc962e..42d95b7bc4 100644 --- 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 1924fcb4db..2587fdf727 100644 --- 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 160fa4003a..8b9d99738e 100644 --- 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" |