Automerge.

315748a4 · Alexey Kopytov · a6ac350b · 0f6e7f11 · 315748a4 · 315748a4
Commit 315748a4 authored Feb 25, 2009 by Alexey Kopytov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

include/my_global.h include/my_global.h +3 -0

sql/mysqld.cc sql/mysqld.cc +0 -3

No files found.
--- 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>