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.
This commit is contained in:
parent
0e62c9aa63
commit
0f6e7f1176
@ -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>
|
||||
|
@ -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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user