mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0

Browse source 
into  neptunus.(none):/home/msvensson/mysql/bug12526/my50-bug12526
This commit is contained in:
unknown 2005-09-01 14:09:23 +02:00
commit 944666ef1d
3 changed files with 38 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
extra/yassl/taocrypt/include/misc.hpp
View file

@ -96,6 +96,13 @@ public:
#endif
// Disable assmebler when compiling with icc
// Temporary workaround for bug12717
#if defined(__INTEL_COMPILER)
#define TAOCRYPT_DISABLE_X86ASM
#endif
// CodeWarrior defines _MSC_VER
#if !defined(TAOCRYPT_DISABLE_X86ASM) && ((defined(_MSC_VER) && \