aboutsummaryrefslogtreecommitdiff
path: root/libxsde/xsde/c/expat/expat_external.h
diff options
context:
space:
mode:
Diffstat (limited to 'libxsde/xsde/c/expat/expat_external.h')
-rw-r--r--libxsde/xsde/c/expat/expat_external.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libxsde/xsde/c/expat/expat_external.h b/libxsde/xsde/c/expat/expat_external.h
index ea2279e..d54c2f2 100644
--- a/libxsde/xsde/c/expat/expat_external.h
+++ b/libxsde/xsde/c/expat/expat_external.h
@@ -38,9 +38,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
@@ -101,7 +101,7 @@ typedef char XML_LChar;
#ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
-typedef __int64 XML_Index;
+typedef __int64 XML_Index;
typedef unsigned __int64 XML_Size;
#else
typedef long long XML_Index;