diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-06 01:46:01 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-02-06 01:46:01 +0100 |
| commit | 546af1966e56a90ba7ce5ccd434c63b60f14881e (patch) | |
| tree | 203d81a3098fd239d155acd3b398c4ed0cc988c4 /ext | |
| parent | 70b27b5ad874953e76730322e250a7e2d3e77155 (diff) | |
| parent | 8a8aa67844aa098abf98485329a16171f98b4a1c (diff) | |
| download | php-git-546af1966e56a90ba7ce5ccd434c63b60f14881e.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/config.m4 | 12 | ||||
| -rw-r--r-- | ext/standard/tests/math/bug74039.phpt | 28 |
2 files changed, 6 insertions, 34 deletions
diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index 3324ee7a16..f2a1925d1e 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -359,7 +359,7 @@ AC_TRY_RUN([ #include <math.h> #include <stdlib.h> -#ifdef HAVE_DECL_ISNAN +#ifdef HAVE_ISNAN #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) @@ -390,11 +390,11 @@ AC_TRY_RUN([ #include <math.h> #include <stdlib.h> -#ifdef HAVE_DECL_ISINF +#ifdef HAVE_ISINF #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ -#define zend_isinf(a) (((a)==INFINITY || (a)==-INFINITY)?1:0) +#define zend_isinf(a) (((a)==INFINITY)?1:0) #elif defined(HAVE_FPCLASS) #define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) #else @@ -424,11 +424,11 @@ AC_TRY_RUN([ #include <math.h> #include <stdlib.h> -#ifdef HAVE_DECL_ISINF +#ifdef HAVE_ISINF #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ -#define zend_isinf(a) (((a)==INFINITY || (a)==-INFINITY)?1:0) +#define zend_isinf(a) (((a)==INFINITY)?1:0) #elif defined(HAVE_FPCLASS) #define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) #else @@ -459,7 +459,7 @@ AC_TRY_RUN([ #include <math.h> #include <stdlib.h> -#ifdef HAVE_DECL_ISNAN +#ifdef HAVE_ISNAN #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) diff --git a/ext/standard/tests/math/bug74039.phpt b/ext/standard/tests/math/bug74039.phpt deleted file mode 100644 index dd0e1fa260..0000000000 --- a/ext/standard/tests/math/bug74039.phpt +++ /dev/null @@ -1,28 +0,0 @@ ---TEST-- -Bug #74039: is_infinite(-INF) returns false ---FILE-- -<?php - -var_dump(is_finite(INF)); -var_dump(is_infinite(INF)); -var_dump(is_nan(INF)); - -var_dump(is_finite(-INF)); -var_dump(is_infinite(-INF)); -var_dump(is_nan(-INF)); - -var_dump(is_finite(NAN)); -var_dump(is_infinite(NAN)); -var_dump(is_nan(NAN)); - -?> ---EXPECT-- -bool(false) -bool(true) -bool(false) -bool(false) -bool(true) -bool(false) -bool(false) -bool(false) -bool(true) |