Commit fc3c0de4 authored by unknown's avatar unknown
Browse files

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

into  neptunus.(none):/home/msvensson/mysql/bug12717/my50-bug12717
parents dd1fd086 0246d3c8

extra/yassl/taocrypt/include/runtime.hpp

+3 −1
Original line number Diff line number Diff line
@@ -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__

extra/yassl/taocrypt/include/types.hpp

+2 −1
Original line number Diff line number Diff line
@@ -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__))