diff options
| author | Gregory P. Smith <greg@krypto.org> | 2012-07-14 21:12:35 (GMT) |
|---|---|---|
| committer | Gregory P. Smith <greg@krypto.org> | 2012-07-14 21:12:35 (GMT) |
| commit | 7c6309c6afebecd9cefe7c547b87cf23abcbe2a3 (patch) | |
| tree | 9852412a7bad47617cd0d42e01d37e3400229b04 /Modules/expat/expat_external.h | |
| parent | 15810673dc33436cbf8d1a6a6f9622249845b205 (diff) | |
| download | cpython-7c6309c6afebecd9cefe7c547b87cf23abcbe2a3.zip cpython-7c6309c6afebecd9cefe7c547b87cf23abcbe2a3.tar.gz cpython-7c6309c6afebecd9cefe7c547b87cf23abcbe2a3.tar.bz2 | |
Update the embedded copy of the expat XML parser to 2.1.0. It brings
with it a vareity of bug fixes, both security and behavior. See
http://www.libexpat.org/ for the list.
NOTE: I already backported the expat hash randomization fix in March.
Fixes issue #14340.
Diffstat (limited to 'Modules/expat/expat_external.h')
| -rw-r--r-- | Modules/expat/expat_external.h | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Modules/expat/expat_external.h b/Modules/expat/expat_external.h index 3f1c363..2c03284 100644 --- a/Modules/expat/expat_external.h +++ b/Modules/expat/expat_external.h @@ -7,11 +7,7 @@ /* External API definitions */ -/* Namespace external symbols to allow multiple libexpat version to - co-exist. */ -#include "pyexpatns.h" - -#if defined(_MSC_EXTENSIONS) && !defined(__CYGWIN__) +#if defined(_MSC_EXTENSIONS) && !defined(__BEOS__) && !defined(__CYGWIN__) #define XML_USE_MSC_EXTENSIONS 1 #endif @@ -38,9 +34,9 @@ system headers may assume the cdecl convention. */ #ifndef XMLCALL -#if defined(XML_USE_MSC_EXTENSIONS) +#if defined(_MSC_VER) #define XMLCALL __cdecl -#elif defined(__GNUC__) && defined(__i386) +#elif defined(__GNUC__) && defined(__i386) && !defined(__INTEL_COMPILER) #define XMLCALL __attribute__((cdecl)) #else /* For any platform which uses this definition and supports more than |