diff options
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 |