diff options
| author | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-25 10:36:11 +0200 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@sun.com> | 2009-02-25 10:36:11 +0200 |
| commit | 0f6e7f11761cb696103b01f452b5d5afe10bea97 (patch) | |
| tree | 32836ad5229a663df28b4fac7ec0f955c0a279ac /sql/mysqld.cc | |
| parent | 0e62c9aa6301de71164496ec7c81c871d78ce8cd (diff) | |
| download | mariadb-git-0f6e7f11761cb696103b01f452b5d5afe10bea97.tar.gz | |
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.
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 0 insertions, 3 deletions
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> |