mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-17 20:42:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge bk-internal:/home/bk/mysql-5.0

Browse source 
into  neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
This commit is contained in:
unknown 2005-09-08 12:18:09 +02:00
commit 0246d3c8c2
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
extra/yassl/taocrypt/include/runtime.hpp
View file

@ -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 #define yaSSL_NEW_HPP
@ -46,5 +47,6 @@ static int __cxa_pure_virtual()
} // extern "C" } // extern "C"
#endif // __GNUC__ > 2 #endif // __GNUC__ > 2
#endif // ! _ICC
#endif // yaSSL_NEW_HPP && __GNUC__ #endif // yaSSL_NEW_HPP && __GNUC__

3
extra/yassl/taocrypt/include/types.hpp
View file

@ -61,9 +61,10 @@ typedef unsigned int word32;
// compilers we've found 64-bit multiply insructions for // compilers we've found 64-bit multiply insructions for
#if defined(__GNUC__) || defined(_MSC_VER) || defined(__DECCXX) #if defined(__GNUC__) || defined(_MSC_VER) || defined(__DECCXX)
#if !(defined(__ICC) || defined(__INTEL_COMPILER))
#define HAVE_64_MULTIPLY #define HAVE_64_MULTIPLY
#endif #endif
#endif
#if defined(HAVE_64_MULTIPLY) && (defined(__alpha__) || defined(__ia64__) \ #if defined(HAVE_64_MULTIPLY) && (defined(__alpha__) || defined(__ia64__) \
|| defined(_ARCH_PPC64) || defined(__mips64) || defined(__x86_64__)) || defined(_ARCH_PPC64) || defined(__mips64) || defined(__x86_64__))