diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2017-03-17 20:20:17 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2017-03-17 20:20:43 +0100 |
| commit | f2c35fdda809ef1e4d0151e2564422ec3be319a0 (patch) | |
| tree | 30af2ab9a97a6d263b20bfef2f55702f6d19f249 | |
| parent | ebc75dab5052cb23e759626cc839448fecc9563b (diff) | |
| parent | 2e8308260513015dbf80ff0239eca79dbca4f36e (diff) | |
| download | php-git-f2c35fdda809ef1e4d0151e2564422ec3be319a0.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | Zend/configure.in | 6 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | ext/standard/config.m4 | 8 |
4 files changed, 12 insertions, 10 deletions
@@ -10,6 +10,8 @@ PHP NEWS referenced return). (Nikita) . Fixed bug #69676 (Resolution of self::FOO in class constants not correct). (Nikita) + . Fixed bug #74265 (Build problems after 7.0.17 release: undefined reference + to `isfinite'). (Nikita) - Date: . Fixed bug #72096 (Swatch time value incorrect for dates before 1970). (mcq8) diff --git a/Zend/configure.in b/Zend/configure.in index ec339eaef5..6d4d450ea8 100644 --- a/Zend/configure.in +++ b/Zend/configure.in @@ -70,7 +70,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #endif #ifndef zend_isnan -#ifdef HAVE_DECL_ISNAN +#if HAVE_DECL_ISNAN #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) @@ -79,7 +79,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #endif #endif -#ifdef HAVE_DECL_ISINF +#if HAVE_DECL_ISINF #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ @@ -90,7 +90,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #define zend_isinf(a) 0 #endif -#if defined(HAVE_DECL_ISFINITE) +#if HAVE_DECL_ISFINITE #define zend_finite(a) isfinite(a) #elif defined(HAVE_FINITE) #define zend_finite(a) finite(a) diff --git a/configure.in b/configure.in index c169e95fd8..42fd044709 100644 --- a/configure.in +++ b/configure.in @@ -75,7 +75,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #endif #ifndef zend_isnan -#ifdef HAVE_DECL_ISNAN +#if HAVE_DECL_ISNAN #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) @@ -84,7 +84,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #endif #endif -#ifdef HAVE_DECL_ISINF +#if HAVE_DECL_ISINF #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ @@ -95,7 +95,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #define zend_isinf(a) 0 #endif -#if defined(HAVE_DECL_ISFINITE) +#if HAVE_DECL_ISFINITE #define zend_finite(a) isfinite(a) #elif defined(HAVE_FINITE) #define zend_finite(a) finite(a) diff --git a/ext/standard/config.m4 b/ext/standard/config.m4 index d2afcf000d..61eefdc339 100644 --- a/ext/standard/config.m4 +++ b/ext/standard/config.m4 @@ -360,7 +360,7 @@ AC_TRY_RUN([ #include <math.h> #include <stdlib.h> -#ifdef HAVE_DECL_ISNAN +#if HAVE_DECL_ISNAN #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) @@ -391,7 +391,7 @@ AC_TRY_RUN([ #include <math.h> #include <stdlib.h> -#ifdef HAVE_DECL_ISINF +#if HAVE_DECL_ISINF #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ @@ -425,7 +425,7 @@ AC_TRY_RUN([ #include <math.h> #include <stdlib.h> -#ifdef HAVE_DECL_ISINF +#if HAVE_DECL_ISINF #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ @@ -460,7 +460,7 @@ AC_TRY_RUN([ #include <math.h> #include <stdlib.h> -#ifdef HAVE_DECL_ISNAN +#if HAVE_DECL_ISNAN #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) |