diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-25 10:39:28 +0200 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-25 10:39:28 +0200 |
| commit | aa9b46c767a403372e98d86c19019f09ceb0a5e2 (patch) | |
| tree | 0f215c1126b7b124e9681e2a9e65f46774b4c3f6 | |
| parent | 2247fb7cd1cb5bb33a0476cd4b9b1106ebbf70c9 (diff) | |
| parent | d8130a35fb49b568802ac416475b2886b3d03c4d (diff) | |
| download | mariadb-git-aa9b46c767a403372e98d86c19019f09ceb0a5e2.tar.gz | |
Automerge.
| -rw-r--r-- | include/my_global.h | 3 | ||||
| -rw-r--r-- | sql/mysqld.cc | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/my_global.h b/include/my_global.h index 5250d24d0e1..ad86aeb749f 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -424,6 +424,9 @@ C_MODE_END #ifdef HAVE_FLOAT_H #include <float.h> #endif +#ifdef HAVE_FENV_H +#include <fenv.h> /* For fesetround() */ +#endif #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> diff --git a/sql/mysqld.cc b/sql/mysqld.cc index a9b8c9112f3..471423708eb 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -178,9 +178,6 @@ int initgroups(const char *,unsigned int); typedef fp_except fp_except_t; #endif #endif /* __FreeBSD__ && HAVE_IEEEFP_H */ -#ifdef HAVE_FENV_H -#include <fenv.h> -#endif #ifdef HAVE_SYS_FPU_H /* for IRIX to use set_fpc_csr() */ #include <sys/fpu.h> |