Automerge.

7e7de8a9 · Alexey Kopytov · a0752a9e · e59f4166 · 7e7de8a9
Commit 7e7de8a9 authored Jul 21, 2010 by Alexey Kopytov
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

sql/mysqld.cc sql/mysqld.cc +1 -1

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