com php-src: Use zend_ polyfilled nan/finite, check finite: Zend/zend_operators.h
| From: | ajf@php.net | Date: | Tue, 19 Aug 2014 21:03:16 +0000 |
| Subject: | com php-src: Use zend_ polyfilled nan/finite, check finite: Zend/zend_operators.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81841@lists.php.net to get a copy of this message | ||
Commit: 676ed04d0df2df67efdf93076370a10e4d457965
Author: Andrea Faulds <ajf@ajf.me> Tue, 19 Aug 2014 22:03:16 +0100
Parents: 59f6cec3dd14ed82f3b4bb138a0ef51be3bca784
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=676ed04d0df2df67efdf93076370a10e4d457965
Log:
Use zend_ polyfilled nan/finite, check finite
Changed paths:
M Zend/zend_operators.h
Diff:
diff --git a/Zend/zend_operators.h b/Zend/zend_operators.h
index edc2d56..f168af7 100644
--- a/Zend/zend_operators.h
+++ b/Zend/zend_operators.h
@@ -71,16 +71,10 @@ ZEND_API zend_bool instanceof_function_ex(const zend_class_entry *instance_ce, c
ZEND_API zend_bool instanceof_function(const zend_class_entry *instance_ce, const zend_class_entry
*ce TSRMLS_DC);
END_EXTERN_C()
-/* isnan() might not be available (<C99), so we'll define it if so */
-#ifndef isnan
- /* NaN is never equal to itself */
-# define isnan(n) ((n) != (n))
-#endif
-
#if ZEND_DVAL_TO_LVAL_CAST_OK
static zend_always_inline long zend_dval_to_lval(double d)
{
- if (EXPECTED(!isnan(d))) {
+ if (EXPECTED(zend_finite(d)) && EXPECTED(!zend_isnan(d))) {
return (long)d;
} else {
return 0;
@@ -100,7 +94,7 @@ static zend_always_inline long zend_dval_to_lval(double d)
dmod = ceil(dmod) + two_pow_32;
}
return (long)(unsigned long)dmod;
- } else if (UNEXPECTED(isnan(d))) {
+ } else if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) {
return 0;
}
return (long)d;
@@ -120,7 +114,7 @@ static zend_always_inline long zend_dval_to_lval(double d)
dmod += two_pow_64;
}
return (long)(unsigned long)dmod;
- } else if (UNEXPECTED(isnan(d))) {
+ } else if (UNEXPECTED(!zend_finite(d)) || UNEXPECTED(zend_isnan(d))) {
return 0;
}
return (long)d;