diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2010-07-21 14:13:19 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2010-07-21 14:13:19 +0400 |
| commit | 9268ca7320c3ddfc538d12a21ac35f5a05accb08 (patch) | |
| tree | 41863142f5005f2e665f061527875336cf5083e5 /sql/mysqld.cc | |
| parent | 7df08645980c56b343dc32e3c543fbcb0c8f7259 (diff) | |
| parent | e98169d52c8610efa523040d4409054e352f92df (diff) | |
| download | mariadb-git-9268ca7320c3ddfc538d12a21ac35f5a05accb08.tar.gz | |
Automerge.
Diffstat (limited to 'sql/mysqld.cc')
| -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 1e5c3f43f5e..45260e92788 100644 --- 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 |