Merge branch 'PHP-7.1' into PHP-7.2

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

diff --cc Zend/configure.ac
index 00e599d6396f557f23e827ca276ff048cf1cb072,212a96b7a46f186024759bcb9fa2c6c2eb3b2a7b..b95c1360b8930f3554e656c5c03fe905db589f23
--- 1/Zend/configure.ac
--- 2/Zend/configure.in
+++ 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 cb3d4cd56e39360f18f9448d573c7a5cd274abf4,b920d5b76835fe40a1aa19d88c6f051eb01c9260..d8dc32c63b369a8c5a772eb37d0fc5c3cbe89e01
--- 1/configure.ac
--- 2/configure.in
+++ 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))