From 0f6e7f11761cb696103b01f452b5d5afe10bea97 Mon Sep 17 00:00:00 2001
From: Alexey Kopytov <Alexey.Kopytov@sun.com>
Date: Wed, 25 Feb 2009 10:36:11 +0200
Subject: [PATCH] Fixed a build failure on Ubuntu 8.10 introduced by the patch
 for bug #15936.

On some platforms fenv.h may #undef the min/max macros
defined in my_global.h.

Fixed by moving the #include directive for fenv.h from
mysqld.cc to my_global.h before definitions for min/max.

include/my_global.h:
  Moved #include <fenv.h> from mysqld.cc.
sql/mysqld.cc:
  Moved #include <fenv.h> to my_global.h.
---
 include/my_global.h | 3 +++
 sql/mysqld.cc       | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/my_global.h b/include/my_global.h
index 3f872bfc855..f5a3016bb1e 100644
--- 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>
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 7856309b095..fcde4e2b626 100644
--- 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>