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

into neptunus.(none):/home/msvensson/mysql/bug12987/my50-bug12987

Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/bug12987/my50-bug12987
728b9be6 · unknown · 9ed942fe · fe5a4e3b · 728b9be6
Commit 728b9be6 authored Sep 08, 2005 by unknown
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

extra/yassl/taocrypt/include/misc.hpp extra/yassl/taocrypt/include/misc.hpp +1 -1

No files found.
--- a/extra/yassl/taocrypt/include/misc.hpp
+++ b/extra/yassl/taocrypt/include/misc.hpp
@@ -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