mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 10:31:54 +01:00
Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.0-build
into pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build
This commit is contained in:
commit
77e1e678d3
4 changed files with 21 additions and 14 deletions
18
configure.in
18
configure.in
|
@ -1926,12 +1926,20 @@ case "$target" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# isinf() could be a function or a macro (HPUX)
|
# Check that isinf() is available in math.h and can be used in both C and C++
|
||||||
AC_MSG_CHECKING(for isinf with <math.h>)
|
# code
|
||||||
|
AC_MSG_CHECKING(for isinf in <math.h>)
|
||||||
AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
|
AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function]),
|
AC_MSG_CHECKING(whether isinf() can be used in C++ code)
|
||||||
AC_MSG_RESULT(no))
|
AC_LANG_SAVE
|
||||||
|
AC_LANG_CPLUSPLUS
|
||||||
|
AC_TRY_LINK([#include <math.h>], [float f = 0.0; int r = isinf(f); return r],
|
||||||
|
AC_MSG_RESULT(yes)
|
||||||
|
AC_DEFINE(HAVE_ISINF, [1], [isinf() macro or function]),
|
||||||
|
AC_MSG_RESULT(no))
|
||||||
|
AC_LANG_RESTORE,
|
||||||
|
AC_MSG_RESULT(no))
|
||||||
|
|
||||||
CFLAGS="$ORG_CFLAGS"
|
CFLAGS="$ORG_CFLAGS"
|
||||||
|
|
||||||
|
|
|
@ -867,12 +867,11 @@ typedef SOCKET_SIZE_TYPE size_socket;
|
||||||
#define isnan(x) ((x) != (x))
|
#define isnan(x) ((x) != (x))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if !defined(HAVE_ISINF)
|
#ifdef HAVE_ISINF
|
||||||
/* The configure check for "isinf with math.h" has failed */
|
/* isinf() can be used in both C and C++ code */
|
||||||
#ifdef isinf
|
#define my_isinf(X) isinf(X)
|
||||||
#undef isinf
|
#else
|
||||||
#endif
|
#define my_isinf(X) (!finite(X) && !isnan(X))
|
||||||
#define isinf(X) (!finite(X) && !isnan(X))
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Define missing math constants. */
|
/* Define missing math constants. */
|
||||||
|
|
|
@ -2023,9 +2023,9 @@ double my_double_round(double value, longlong dec, bool dec_unsigned,
|
||||||
tmp=(abs_dec < array_elements(log_10) ?
|
tmp=(abs_dec < array_elements(log_10) ?
|
||||||
log_10[abs_dec] : pow(10.0,(double) abs_dec));
|
log_10[abs_dec] : pow(10.0,(double) abs_dec));
|
||||||
|
|
||||||
if (dec_negative && isinf(tmp))
|
if (dec_negative && my_isinf(tmp))
|
||||||
tmp2= 0;
|
tmp2= 0;
|
||||||
else if (!dec_negative && isinf(value * tmp))
|
else if (!dec_negative && my_isinf(value * tmp))
|
||||||
tmp2= value;
|
tmp2= value;
|
||||||
else if (truncate)
|
else if (truncate)
|
||||||
{
|
{
|
||||||
|
|
|
@ -194,7 +194,7 @@ double my_strtod(const char *str, char **end_ptr, int *error)
|
||||||
done:
|
done:
|
||||||
*end_ptr= (char*) str; /* end of number */
|
*end_ptr= (char*) str; /* end of number */
|
||||||
|
|
||||||
if (overflow || isinf(result))
|
if (overflow || my_isinf(result))
|
||||||
{
|
{
|
||||||
result= DBL_MAX;
|
result= DBL_MAX;
|
||||||
*error= EOVERFLOW;
|
*error= EOVERFLOW;
|
||||||
|
|
Loading…
Add table
Reference in a new issue