traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Neal Norwitz 2006-05-02 07:27:47 +00:00
parent 017e68c413
commit 9652baaf44
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/expat/xmlparse.c
View File

@ -2,10 +2,6 @@
See the file COPYING for copying permission. See the file COPYING for copying permission.
*/ */
#include <stddef.h>
#include <string.h> /* memset(), memcpy() */
#include <assert.h>
#define XML_BUILDING_EXPAT 1 #define XML_BUILDING_EXPAT 1
#ifdef COMPILED_FROM_DSP #ifdef COMPILED_FROM_DSP
@ -16,6 +12,10 @@
#include <expat_config.h> #include <expat_config.h>
#endif /* ndef COMPILED_FROM_DSP */ #endif /* ndef COMPILED_FROM_DSP */
#include <stddef.h>
#include <string.h> /* memset(), memcpy() */
#include <assert.h>
#include "expat.h" #include "expat.h"
#ifdef XML_UNICODE #ifdef XML_UNICODE

4
Modules/expat/xmlrole.c
View File

@ -2,8 +2,6 @@
See the file COPYING for copying permission. See the file COPYING for copying permission.
*/ */
#include <stddef.h>
#ifdef COMPILED_FROM_DSP #ifdef COMPILED_FROM_DSP
#include "winconfig.h" #include "winconfig.h"
#elif defined(MACOS_CLASSIC) #elif defined(MACOS_CLASSIC)
@ -14,6 +12,8 @@
#endif #endif
#endif /* ndef COMPILED_FROM_DSP */ #endif /* ndef COMPILED_FROM_DSP */
#include <stddef.h>
#include "expat_external.h" #include "expat_external.h"
#include "internal.h" #include "internal.h"
#include "xmlrole.h" #include "xmlrole.h"

4
Modules/expat/xmltok.c
View File

@ -2,8 +2,6 @@
See the file COPYING for copying permission. See the file COPYING for copying permission.
*/ */
#include <stddef.h>
#ifdef COMPILED_FROM_DSP #ifdef COMPILED_FROM_DSP
#include "winconfig.h" #include "winconfig.h"
#elif defined(MACOS_CLASSIC) #elif defined(MACOS_CLASSIC)
@ -14,6 +12,8 @@
#endif #endif
#endif /* ndef COMPILED_FROM_DSP */ #endif /* ndef COMPILED_FROM_DSP */
#include <stddef.h>
#include "expat_external.h" #include "expat_external.h"
#include "internal.h" #include "internal.h"
#include "xmltok.h" #include "xmltok.h"