summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <georg@lmy002.wdf.sap.corp>2005-06-27 09:36:43 +0200
committerunknown <georg@lmy002.wdf.sap.corp>2005-06-27 09:36:43 +0200
commit3bdac0a06e0310c2961c7c6f446db2c54a824566 (patch)
tree6342196d8e076a143fa899d72c926fee10e362a3
parent1d937708e8255bf9fb11f90bfc23f9321bf23bd3 (diff)
downloadmariadb-git-3bdac0a06e0310c2961c7c6f446db2c54a824566.tar.gz
Fix for Intel compiler
-rw-r--r--extra/yassl/taocrypt/src/integer.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/src/integer.cpp b/extra/yassl/taocrypt/src/integer.cpp
index 0f06bb4e044..460b2d31426 100644
--- a/extra/yassl/taocrypt/src/integer.cpp
+++ b/extra/yassl/taocrypt/src/integer.cpp
@@ -35,7 +35,8 @@
#endif
-#if defined(_MSC_VER) && defined(_WIN64) // 64 bit X overflow intrinsic
+#if defined(_MSC_VER) && defined(_WIN64) && \
+ !defined(__INTEL_COMPILER) // 64 bit X overflow intrinsic
#ifdef __ia64__
#define myUMULH __UMULH
#elif __x86_64__