From: Nikita Popov Date: Fri, 17 Mar 2017 19:21:28 +0000 (+0100) Subject: Merge branch 'PHP-7.1' X-Git-Tag: php-7.2.0alpha1~246 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ea36cf2b89dc7c0ffedc56dfeff865ed14273063;p=php Merge branch 'PHP-7.1' --- ea36cf2b89dc7c0ffedc56dfeff865ed14273063 diff --cc Zend/configure.ac index 3cda933a59,6d4d450ea8..18fde34466 --- a/Zend/configure.ac +++ b/Zend/configure.ac @@@ -62,8 -62,15 +62,8 @@@ int zend_sprintf(char *buffer, const ch #include -/* 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 593585629e,42fd044709..5c0b50895f --- a/configure.ac +++ b/configure.ac @@@ -67,8 -67,15 +67,8 @@@ int zend_sprintf(char *buffer, const ch #include -/* 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))