Merge branch 'PHP-7.1'

diff --cc Zend/Zend.m4
Simple merge

diff --cc Zend/configure.ac
index 5dfdccac6dd5be814650cf9d9b83eda1c8a986f4,5733b30ce06aa2d80ac19b2c17460c96033dc455..31bafdc546acdbcf31c2fd2a304b0eda37b64830
--- 1/Zend/configure.ac
--- 2/Zend/configure.in
+++ b/Zend/configure.ac
@@@ -62,8 -62,15 +62,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_ISINFINITE 1
 -#endif
 -
  #ifndef zend_isnan
- #ifdef HAVE_ISNAN
+ #ifdef 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))

diff --cc configure.ac
index 5584a4f43a36e84c8504cba1fe715329330501a9,452212389d7ddeddb1cf5938254d40e32a74a7f7..8326895a3d2f265c0e137e0a3d1bfd43abb4962f
--- 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_ISINFINITE 1
 -#endif
 -
  #ifndef zend_isnan
- #ifdef HAVE_ISNAN
+ #ifdef 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))