diff options
Diffstat (limited to 'ext/standard/math.c')
| -rw-r--r-- | ext/standard/math.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/ext/standard/math.c b/ext/standard/math.c index ebfee8ead8..0a408d0adc 100644 --- a/ext/standard/math.c +++ b/ext/standard/math.c @@ -93,18 +93,6 @@ static inline double php_intpow10(int power) { } /* }}} */ -/* {{{ php_math_is_finite */ -static inline int php_math_is_finite(double value) { -#if defined(PHP_WIN32) - return _finite(value); -#elif defined(isfinite) - return isfinite(value); -#else - return value == value && (value == 0. || value * 2. != value); -#endif -} -/* }}} */ - /* {{{ php_round_helper Actually performs the rounding of a value to integer in a certain mode */ static inline double php_round_helper(double value, int mode) { @@ -142,7 +130,7 @@ PHPAPI double _php_math_round(double value, int places, int mode) { double tmp_value; int precision_places; - if (!php_math_is_finite(value)) { + if (!zend_finite(value)) { return value; } @@ -1261,11 +1249,11 @@ PHP_FUNCTION(base_convert) convert_to_string_ex(number); if (frombase < 2 || frombase > 36) { - php_error_docref(NULL, E_WARNING, "Invalid `from base' (%pd)", frombase); + php_error_docref(NULL, E_WARNING, "Invalid `from base' (" ZEND_LONG_FMT ")", frombase); RETURN_FALSE; } if (tobase < 2 || tobase > 36) { - php_error_docref(NULL, E_WARNING, "Invalid `to base' (%pd)", tobase); + php_error_docref(NULL, E_WARNING, "Invalid `to base' (" ZEND_LONG_FMT ")", tobase); RETURN_FALSE; } |