diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2019-12-07 18:05:44 +0100 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2019-12-08 14:55:26 +0100 |
| commit | 4daa680512c010894e1954bff063a94935dc7931 (patch) | |
| tree | ba1dbccbb80b786b60dbb6357ed5cac5e211b029 | |
| parent | 2ede8db1b455e0988167aa0dee2e014220471152 (diff) | |
| download | php-git-4daa680512c010894e1954bff063a94935dc7931.tar.gz | |
Drop duplicate definitions of zend_isnan and friends
Following up on commit 1c4ad17[1], we remove these definitions from
zend_config.w32.h, since they would be overridden by those in
zend_portability.h anyway.
[1] <http://git.php.net/?p=php-src.git;a=commit;h=1c4ad17cc1e483201a36b027f20aab1f91d19628>
| -rw-r--r-- | Zend/zend_config.w32.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h index 19a5165e4b..47387895e5 100644 --- a/Zend/zend_config.w32.h +++ b/Zend/zend_config.w32.h @@ -47,18 +47,6 @@ #endif #define strcasecmp(s1, s2) _stricmp(s1, s2) #define strncasecmp(s1, s2, n) _strnicmp(s1, s2, n) -#if defined(__cplusplus) && __cplusplus >= 201103L -extern "C++" { -#include <cmath> -#define zend_isnan std::isnan -#define zend_isinf std::isinf -#define zend_finite std::isfinite -} -#else -#define zend_isinf(a) ((_fpclass(a) == _FPCLASS_PINF) || (_fpclass(a) == _FPCLASS_NINF)) -#define zend_finite(x) _finite(x) -#define zend_isnan(x) _isnan(x) -#endif #ifndef __cplusplus /* This will cause the compilation process to be MUCH longer, but will generate |