diff options
| author | unknown <svoj@mysql.com> | 2005-06-23 16:04:10 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com> | 2005-06-23 16:04:10 +0500 |
| commit | 089d20959e2f5551473f843f320495a811b6191b (patch) | |
| tree | ecf3b997f28c19e9a6e7f00212b197d2464aa4fb /extra | |
| parent | ca01b8918e35eec5ec830ac0b97fdbfce808242d (diff) | |
| download | mariadb-git-089d20959e2f5551473f843f320495a811b6191b.tar.gz | |
WL#2286 - Compile MySQL w/YASSL support
Fix for "multiple definition of __cxa_pure_virtual" link failure
when compiling with icc.
extra/yassl/taocrypt/include/runtime.hpp:
Do not define __cxa_pure_virtual for ICC.
Fixes "multiple definition of __cxa_pure_virtual" link failure on production.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/include/runtime.hpp | 2 |
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 |