Merge branch 'PHP-7.1'

diff --cc Zend/configure.ac
index 3cda933a59b25e9ef8d7a634a4930c92f9e886c4,6d4d450ea8953b758d8d20421510ce9d344b805e..18fde34466b7881a72b206e3521aaca6410eaf7b
--- 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_ISFINITE 1
 -#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))

diff --cc configure.ac
index 593585629ea0c52f9b3e19e28242aefcdf923e4d,42fd04470905230fe849c3f624be5b4af1a648ec..5c0b50895f262ebaf84ed38c9115cac2a01b6e1c
--- 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
- #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))