diff options
Diffstat (limited to 'Zend/zend_config.w32.h')
| -rw-r--r-- | Zend/zend_config.w32.h | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/Zend/zend_config.w32.h b/Zend/zend_config.w32.h index cb58c8bdb2..19a5165e4b 100644 --- a/Zend/zend_config.w32.h +++ b/Zend/zend_config.w32.h @@ -2,7 +2,7 @@ +----------------------------------------------------------------------+ | Zend Engine | +----------------------------------------------------------------------+ - | Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) | + | Copyright (c) Zend Technologies Ltd. (http://www.zend.com) | +----------------------------------------------------------------------+ | This source file is subject to version 2.00 of the Zend license, | | that is bundled with this package in the file LICENSE, and is | @@ -38,9 +38,6 @@ #include <float.h> -typedef unsigned long ulong; -typedef unsigned int uint; - #define HAVE_STDIOSTR_H 1 #define HAVE_CLASS_ISTDIOSTREAM #define istdiostream stdiostream @@ -50,11 +47,18 @@ typedef unsigned int uint; #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) - -#define zend_sprintf sprintf +#endif #ifndef __cplusplus /* This will cause the compilation process to be MUCH longer, but will generate @@ -76,13 +80,3 @@ typedef unsigned int uint; #define ZEND_DLIMPORT __declspec(dllimport) #endif /* ZEND_CONFIG_W32_H */ - -/* - * Local variables: - * tab-width: 4 - * c-basic-offset: 4 - * indent-tabs-mode: t - * End: - * vim600: sw=4 ts=4 fdm=marker - * vim<600: sw=4 ts=4 - */ |