diff options
| author | msvensson@neptunus.(none) <> | 2005-09-08 12:18:09 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-09-08 12:18:09 +0200 |
| commit | 815941fd460309fa6a4367ed44e897373bf7f94f (patch) | |
| tree | afedc3875f84a34b662f8360d47c48948e484b2e /extra | |
| parent | 08200d85aec85baea79a3b2ecdbc228cbfb615c6 (diff) | |
| parent | 60e3c3be0b0b96d7000c05f0a229a29a09be11ea (diff) | |
| download | mariadb-git-815941fd460309fa6a4367ed44e897373bf7f94f.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/yassl/taocrypt/include/runtime.hpp | 4 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/include/types.hpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/extra/yassl/taocrypt/include/runtime.hpp b/extra/yassl/taocrypt/include/runtime.hpp index f506040f0d8..254e67a7f64 100644 --- a/extra/yassl/taocrypt/include/runtime.hpp +++ b/extra/yassl/taocrypt/include/runtime.hpp @@ -25,7 +25,8 @@ -#if !defined(yaSSL_NEW_HPP) && defined(__GNUC__) && !defined(__ICC) +#if !defined(yaSSL_NEW_HPP) && defined(__GNUC__) +#if !(defined(__ICC) || defined(__INTEL_COMPILER)) #define yaSSL_NEW_HPP @@ -46,5 +47,6 @@ static int __cxa_pure_virtual() } // extern "C" #endif // __GNUC__ > 2 +#endif // ! _ICC #endif // yaSSL_NEW_HPP && __GNUC__ diff --git a/extra/yassl/taocrypt/include/types.hpp b/extra/yassl/taocrypt/include/types.hpp index 92164eaaab4..db9c3792bbd 100644 --- a/extra/yassl/taocrypt/include/types.hpp +++ b/extra/yassl/taocrypt/include/types.hpp @@ -61,9 +61,10 @@ typedef unsigned int word32; // compilers we've found 64-bit multiply insructions for #if defined(__GNUC__) || defined(_MSC_VER) || defined(__DECCXX) +#if !(defined(__ICC) || defined(__INTEL_COMPILER)) #define HAVE_64_MULTIPLY #endif - +#endif #if defined(HAVE_64_MULTIPLY) && (defined(__alpha__) || defined(__ia64__) \ || defined(_ARCH_PPC64) || defined(__mips64) || defined(__x86_64__)) |