diff options
| author | Anatol Belski <ab@php.net> | 2018-07-08 20:32:52 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-07-08 20:32:52 +0200 |
| commit | 545a29d0cb8e57cc6739649130a9ad6e08874c74 (patch) | |
| tree | 11e81bb5310a15e0fd819ed49de4e065a50a7f8d | |
| parent | 77a841db483b878fa3b8519c9b9ed5d6418303bb (diff) | |
| parent | ad790bea2e4a8a25c79ceab964601f3785cd2bf1 (diff) | |
| download | php-git-545a29d0cb8e57cc6739649130a9ad6e08874c74.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix C++11 and up compatibility for zend_finite and more
| -rw-r--r-- | Zend/configure.ac | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Zend/configure.ac b/Zend/configure.ac index 00e599d639..b95c1360b8 100644 --- a/Zend/configure.ac +++ b/Zend/configure.ac @@ -60,7 +60,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #include <math.h> #ifndef zend_isnan -#if HAVE_DECL_ISNAN +#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L) #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) @@ -69,7 +69,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #endif #endif -#if HAVE_DECL_ISINF +#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L) #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ @@ -80,7 +80,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #define zend_isinf(a) 0 #endif -#if HAVE_DECL_ISFINITE +#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L) #define zend_finite(a) isfinite(a) #elif defined(HAVE_FINITE) #define zend_finite(a) finite(a) diff --git a/configure.ac b/configure.ac index cb3d4cd56e..d8dc32c63b 100644 --- a/configure.ac +++ b/configure.ac @@ -68,7 +68,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #include <math.h> #ifndef zend_isnan -#if HAVE_DECL_ISNAN +#if HAVE_DECL_ISNAN && (!defined(__cplusplus) || __cplusplus < 201103L) #define zend_isnan(a) isnan(a) #elif defined(HAVE_FPCLASS) #define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) @@ -77,7 +77,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #endif #endif -#if HAVE_DECL_ISINF +#if HAVE_DECL_ISINF && (!defined(__cplusplus) || __cplusplus < 201103L) #define zend_isinf(a) isinf(a) #elif defined(INFINITY) /* Might not work, but is required by ISO C99 */ @@ -88,7 +88,7 @@ int zend_sprintf(char *buffer, const char *format, ...); #define zend_isinf(a) 0 #endif -#if HAVE_DECL_ISFINITE +#if HAVE_DECL_ISFINITE && (!defined(__cplusplus) || __cplusplus < 201103L) #define zend_finite(a) isfinite(a) #elif defined(HAVE_FINITE) #define zend_finite(a) finite(a) |