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 /include | |
| 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 'include')
| -rw-r--r-- | include/my_global.h | 3 |
1 files changed, 3 insertions, 0 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> |