bzr commit into mysql-5.0-bugteam branch (Alexey.Kopytov:2753) Bug#15936

[Alexey Kopytov]

#At file:///Users/kaa/src/bzr/bugteam/bug15936/my50-bug15936/ based on revid:alexey.kopytov@stripped

 2753 Alexey Kopytov	2009-02-25
      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.
      modified:
        include/my_global.h
        sql/mysqld.cc

per-file messages:
  include/my_global.h
    Moved #include <fenv.h> from mysqld.cc.
  sql/mysqld.cc
    Moved #include <fenv.h> to my_global.h.
=== modified file 'include/my_global.h'
--- a/include/my_global.h	2009-02-23 12:28:26 +0000
+++ b/include/my_global.h	2009-02-25 08:36:11 +0000
@@ -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>

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2009-02-23 12:28:26 +0000
+++ b/sql/mysqld.cc	2009-02-25 08:36:11 +0000
@@ -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>