Skip to content

M
mariadb
Commit aa9b46c7 authored by Alexey Kopytov's avatar Alexey Kopytov
Browse files
Options

Automerge.

parents 2247fb7c d8130a35
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
include/my_global.h
View file @ aa9b46c7
...@@ -424,6 +424,9 @@ C_MODE_END ...@@ -424,6 +424,9 @@ C_MODE_END
#ifdef HAVE_FLOAT_H #ifdef HAVE_FLOAT_H
#include <float.h> #include <float.h>
#endif #endif
#ifdef HAVE_FENV_H
#include <fenv.h> /* For fesetround() */
#endif
#ifdef HAVE_SYS_TYPES_H #ifdef HAVE_SYS_TYPES_H
#include <sys/types.h> #include <sys/types.h>
......
sql/mysqld.cc
View file @ aa9b46c7
...@@ -178,9 +178,6 @@ int initgroups(const char *,unsigned int); ...@@ -178,9 +178,6 @@ int initgroups(const char *,unsigned int);
typedef fp_except fp_except_t; typedef fp_except fp_except_t;
#endif #endif
#endif /* __FreeBSD__ && HAVE_IEEEFP_H */ #endif /* __FreeBSD__ && HAVE_IEEEFP_H */
#ifdef HAVE_FENV_H
#include <fenv.h>
#endif
#ifdef HAVE_SYS_FPU_H #ifdef HAVE_SYS_FPU_H
/* for IRIX to use set_fpc_csr() */ /* for IRIX to use set_fpc_csr() */
#include <sys/fpu.h> #include <sys/fpu.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7