From: Nikita Popov <nikita.ppv@gmail.com>
Date: Sun, 5 Feb 2017 17:13:24 +0000 (+0100)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~399
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b73190d91903f2fa8487746403efbb006d84321e;p=php

Merge branch 'PHP-7.1'
---

b73190d91903f2fa8487746403efbb006d84321e
diff --cc Zend/configure.ac
index 5dfdccac6d,5733b30ce0..31bafdc546
--- a/Zend/configure.ac
+++ 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 5584a4f43a,452212389d..8326895a3d
--- 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_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))