Backport of the patch for bug52208 to 5.1 since the

root cause of 52208 resulted in another test failure in 5.1.

Backport of the patch for bug52208 to 5.1 since the
root cause of 52208 resulted in another test failure in 5.1.
d2e58e4e · Alexey Kopytov · 6537d79e · d2e58e4e
Commit d2e58e4e authored Jun 15, 2010 by Alexey Kopytov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

sql/mysqld.cc sql/mysqld.cc +3 -3

No files found.
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -190,9 +190,9 @@ typedef fp_except fp_except_t;
 # define fpu_control_t unsigned int
 # define _FPU_EXTENDED 0x300
 # define _FPU_DOUBLE 0x200
-# ifdef __GNUC__
+# if defined(__GNUC__) || defined(__SUNPRO_CC)
-#  define _FPU_GETCW(cw) __asm__ __volatile__("fnstcw %0" : "=m" (*&cw))
+#  define _FPU_GETCW(cw) asm volatile ("fnstcw %0" : "=m" (*&cw))
-#  define _FPU_SETCW(cw) __asm__ __volatile__("fldcw %0" : : "m" (*&cw))
+#  define _FPU_SETCW(cw) asm volatile ("fldcw %0" : : "m" (*&cw))
 # else
 #  define _FPU_GETCW(cw) (cw= 0)
 #  define _FPU_SETCW(cw)