From: Anatol Belski <ab@php.net>
Date: Sun, 8 Jul 2018 18:32:52 +0000 (+0200)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.3.0alpha4~73^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=545a29d0cb8e57cc6739649130a9ad6e08874c74;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix C++11 and up compatibility for zend_finite and more
---

545a29d0cb8e57cc6739649130a9ad6e08874c74
diff --cc Zend/configure.ac
index 00e599d639,212a96b7a4..b95c1360b8
--- a/Zend/configure.ac
+++ b/Zend/configure.ac
@@@ -59,8 -62,15 +59,8 @@@ int zend_sprintf(char *buffer, const ch
  
  #include <math.h>
  
 -/* To enable the is_nan, is_infinite and is_finite PHP functions */
 -#ifdef NETWARE
 -	#define HAVE_DECL_ISNAN 1
 -	#define HAVE_DECL_ISINF 1
 -	#define HAVE_DECL_ISFINITE 1
 -#endif
 -
  #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))
diff --cc configure.ac
index cb3d4cd56e,b920d5b768..d8dc32c63b
--- a/configure.ac
+++ b/configure.ac
@@@ -67,8 -67,15 +67,8 @@@ int zend_sprintf(char *buffer, const ch
  
  #include <math.h>
  
 -/* To enable the is_nan, is_infinite and is_finite PHP functions */
 -#ifdef NETWARE
 -	#define HAVE_DECL_ISNAN 1
 -	#define HAVE_DECL_ISINF 1
 -	#define HAVE_DECL_ISFINITE 1
 -#endif
 -
  #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))