diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2010-07-21 14:14:11 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2010-07-21 14:14:11 +0400 |
| commit | d26c6d62a36718b95c5e45d9c87bfbcf445843b6 (patch) | |
| tree | b056cfb986ecf419afbbdb5480feca1ee28e3a0f /sql | |
| parent | 9a5fa17fd3c4885262e31bf14cf495d02e5f6b27 (diff) | |
| parent | e98169d52c8610efa523040d4409054e352f92df (diff) | |
| download | mariadb-git-d26c6d62a36718b95c5e45d9c87bfbcf445843b6.tar.gz | |
Automerge.
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index fda64e5a1ea..08407d52e09 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -190,7 +190,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 |