diff options
| author | svoj@mysql.com <> | 2005-07-01 20:00:59 +0500 |
|---|---|---|
| committer | svoj@mysql.com <> | 2005-07-01 20:00:59 +0500 |
| commit | 9359cec4ca42ff89aefc15f4ba19c9ebb4eb1fef (patch) | |
| tree | 50a170b168a3f21cd4cf1e5a5c1cebfa3b8f1cdd /extra/yassl/taocrypt/src/integer.cpp | |
| parent | b590f0dec0d4fd7b5e21905f2904f80dba8662b3 (diff) | |
| download | mariadb-git-9359cec4ca42ff89aefc15f4ba19c9ebb4eb1fef.tar.gz | |
WL#2286 - Compile MySQL w/YASSL support
Merge with latest yaSSL. It includes fix for bigendian/littleendian
problem (fixes func_encrypt test failure). Our trees are in sync now.
Diffstat (limited to 'extra/yassl/taocrypt/src/integer.cpp')
| -rw-r--r-- | extra/yassl/taocrypt/src/integer.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/extra/yassl/taocrypt/src/integer.cpp b/extra/yassl/taocrypt/src/integer.cpp index 460b2d31426..71324b04b92 100644 --- a/extra/yassl/taocrypt/src/integer.cpp +++ b/extra/yassl/taocrypt/src/integer.cpp @@ -35,8 +35,9 @@ #endif -#if defined(_MSC_VER) && defined(_WIN64) && \ - !defined(__INTEL_COMPILER) // 64 bit X overflow intrinsic +// 64bit multiply overflow intrinsic +#if defined(_MSC_VER) && defined(_WIN64) && !defined(__INTEL_COMPILER) && \ + !defined(TAOCRYPT_NATIVE_DWORD_AVAILABLE) #ifdef __ia64__ #define myUMULH __UMULH #elif __x86_64__ @@ -3957,6 +3958,7 @@ Integer CRT(const Integer &xp, const Integer &p, const Integer &xq, return p * (u * (xq-xp) % q) + xp; } + #ifdef HAVE_EXPLICIT_TEMPLATE_INSTANTIATION #ifndef TAOCRYPT_NATIVE_DWORD_AVAILABLE template hword DivideThreeWordsByTwo<hword, Word>(hword*, hword, hword, Word*); |