Automerge.

17 years ago · 315748a41d
2 changed files with 3 additions and 3 deletions
--- a/include/my_global.h
+++ b/include/my_global.h
@ -324,6 +324,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>
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@ -187,9 +187,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>