Commit 728b9be6 authored by unknown's avatar unknown
Browse files

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

into  neptunus.(none):/home/msvensson/mysql/bug12987/my50-bug12987
parents 9ed942fe fe5a4e3b

extra/yassl/taocrypt/include/misc.hpp

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ public: 




// no gas on these systems ?, disable for now

#if defined(__sun__) || defined (__QNX__)

#if defined(__sun__) || defined (__QNX__) || defined (__APPLE__)

    #define TAOCRYPT_DISABLE_X86ASM

#endif