diff options
| author | Elliott Hughes <enh@google.com> | 2009-09-25 16:04:37 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2009-09-25 16:04:37 -0700 |
| commit | d07d5a72938fd52415368c2320fc29575ae9a0c3 (patch) | |
| tree | 0c51b66a56e624bcd9729cec0454f4e3febddeb8 /lib/expat_external.h | |
| parent | c5b20fe9deacede72276a0c39142fa8397aa4602 (diff) | |
| download | expat-d07d5a72938fd52415368c2320fc29575ae9a0c3.tar.gz | |
Update expat to 2.0.1.
We had one local patch relative to 2.0.0, in "xmltok_impl.c". That
fix isn't in 2.0.1, but an equivalent patch is in expat CVS. I've gone
with the upstream change, and surrounded it with BEGIN/END android-changed
comments.
Bug: 2086506
Diffstat (limited to 'lib/expat_external.h')
| -rw-r--r-- | lib/expat_external.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/expat_external.h b/lib/expat_external.h index 8a2d708f..2c03284e 100644 --- a/lib/expat_external.h +++ b/lib/expat_external.h @@ -34,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 |