diff options
| author | Howard Su <howard0su@gmail.com> | 2018-05-21 22:30:07 +0800 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2018-05-24 00:11:33 +0400 |
| commit | 031fa6d4258574379ca3c1cbe912d235e9581982 (patch) | |
| tree | a078f113b2fa50851b002bc8f9861ee436a082f0 | |
| parent | c13e3c37be4fd5252ce0cad45b616815b236272a (diff) | |
| download | mariadb-git-031fa6d4258574379ca3c1cbe912d235e9581982.tar.gz | |
remove check for finite/isfinite
finite is not used anymore in code base. isfinite is part of C99 and we
assume we only support compilers that support C99.
| -rw-r--r-- | cmake/os/Windows.cmake | 1 | ||||
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 2 | ||||
| -rw-r--r-- | config.h.cmake | 2 | ||||
| -rw-r--r-- | configure.cmake | 6 | ||||
| -rw-r--r-- | include/my_global.h | 11 |
5 files changed, 0 insertions, 22 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 3935894781e..20c5756aa08 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -262,7 +262,6 @@ CHECK_SYMBOL_REPLACEMENT(S_IFIFO _S_IFIFO sys/stat.h) CHECK_SYMBOL_REPLACEMENT(SIGQUIT SIGTERM signal.h) CHECK_SYMBOL_REPLACEMENT(SIGPIPE SIGINT signal.h) CHECK_SYMBOL_REPLACEMENT(isnan _isnan "math.h;float.h") -CHECK_SYMBOL_REPLACEMENT(finite _finite "math;float.h") CHECK_FUNCTION_REPLACEMENT(popen _popen) CHECK_FUNCTION_REPLACEMENT(pclose _pclose) CHECK_FUNCTION_REPLACEMENT(access _access) diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index 1ff4a88892a..5ad3be6e1bc 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -52,8 +52,6 @@ SET(HAVE_DECL_FDATASYNC CACHE INTERNAL "") SET(HAVE_FEDISABLEEXCEPT CACHE INTERNAL "") SET(HAVE_FENV_H CACHE INTERNAL "") SET(HAVE_FESETROUND CACHE INTERNAL "") -SET(HAVE_FINITE CACHE INTERNAL "") -SET(HAVE_FINITE_IN_MATH_H CACHE INTERNAL "") SET(HAVE_FLOAT_H 1 CACHE INTERNAL "") SET(HAVE_FNMATCH_H CACHE INTERNAL "") SET(HAVE_FPU_CONTROL_H CACHE INTERNAL "") diff --git a/config.h.cmake b/config.h.cmake index 0a4007d5ebf..853dd3270c2 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -140,7 +140,6 @@ #cmakedefine HAVE_DECL_FDATASYNC 1 #cmakedefine HAVE_FEDISABLEEXCEPT 1 #cmakedefine HAVE_FESETROUND 1 -#cmakedefine HAVE_FINITE 1 #cmakedefine HAVE_FP_EXCEPT 1 #cmakedefine HAVE_FSEEKO 1 #cmakedefine HAVE_FSYNC 1 @@ -422,7 +421,6 @@ #cmakedefine SIGQUIT @SIGQUIT@ #cmakedefine SIGPIPE @SIGPIPE@ #cmakedefine isnan @isnan@ -#cmakedefine finite @finite@ #cmakedefine popen @popen@ #cmakedefine pclose @pclose@ #cmakedefine ssize_t @ssize_t@ diff --git a/configure.cmake b/configure.cmake index 96b08df3891..05d892849ac 100644 --- a/configure.cmake +++ b/configure.cmake @@ -477,12 +477,6 @@ CHECK_SYMBOL_EXISTS(TIOCSTAT "sys/ioctl.h" TIOCSTAT_IN_SYS_IOCTL) CHECK_SYMBOL_EXISTS(FIONREAD "sys/filio.h" FIONREAD_IN_SYS_FILIO) CHECK_SYMBOL_EXISTS(gettimeofday "sys/time.h" HAVE_GETTIMEOFDAY) -CHECK_SYMBOL_EXISTS(finite "math.h" HAVE_FINITE_IN_MATH_H) -IF(HAVE_FINITE_IN_MATH_H) - SET(HAVE_FINITE TRUE CACHE INTERNAL "") -ELSE() - CHECK_SYMBOL_EXISTS(finite "ieeefp.h" HAVE_FINITE) -ENDIF() CHECK_SYMBOL_EXISTS(log2 math.h HAVE_LOG2) CHECK_SYMBOL_EXISTS(isnan math.h HAVE_ISNAN) CHECK_SYMBOL_EXISTS(rint math.h HAVE_RINT) diff --git a/include/my_global.h b/include/my_global.h index 0769feca94a..a8d0e1626b2 100644 --- a/include/my_global.h +++ b/include/my_global.h @@ -828,14 +828,6 @@ inline unsigned long long my_double2ulonglong(double d) #define SIZE_T_MAX (~((size_t) 0)) #endif -#ifndef HAVE_FINITE -#define finite(x) (1.0 / fabs(x) > 0.0) -#endif - -#ifndef isfinite -#define isfinite(x) finite(x) -#endif - #ifndef HAVE_ISNAN #define isnan(x) ((x) != (x)) #endif @@ -848,9 +840,6 @@ inline unsigned long long my_double2ulonglong(double d) #ifdef __cplusplus #include <cmath> -#ifndef isfinite -#define isfinite(X) std::isfinite(X) -#endif #ifndef isnan #define isnan(X) std::isnan(X) #endif |