Commit 728b9be6 authored by unknown's avatar unknown

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

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

parents 9ed942fe fe5a4e3b
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment