summaryrefslogtreecommitdiff
path: root/extra
diff options
context:
space:
mode:
authorsvoj@mysql.com <>2005-06-23 16:04:10 +0500
committersvoj@mysql.com <>2005-06-23 16:04:10 +0500
commitb720c6e5354e09ec406b5b400051df985ec27801 (patch)
treeecf3b997f28c19e9a6e7f00212b197d2464aa4fb /extra
parenta190236e0a67ec30e950b44280bc3a7511d43e04 (diff)
downloadmariadb-git-b720c6e5354e09ec406b5b400051df985ec27801.tar.gz
WL#2286 - Compile MySQL w/YASSL support
Fix for "multiple definition of __cxa_pure_virtual" link failure when compiling with icc.
Diffstat (limited to 'extra')
-rw-r--r--extra/yassl/taocrypt/include/runtime.hpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/taocrypt/include/runtime.hpp b/extra/yassl/taocrypt/include/runtime.hpp
index 70768bb01d1..f506040f0d8 100644
--- a/extra/yassl/taocrypt/include/runtime.hpp
+++ b/extra/yassl/taocrypt/include/runtime.hpp
@@ -25,7 +25,7 @@
-#if !defined(yaSSL_NEW_HPP) && defined(__GNUC__)
+#if !defined(yaSSL_NEW_HPP) && defined(__GNUC__) && !defined(__ICC)
#define yaSSL_NEW_HPP