From 30802dbc557a25f57db22ecda1c39678791a4aec Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 25 Apr 2013 22:44:29 +0200 Subject: [PATCH] Fixed float precision change under Windows x64 otherwise we'll have asserts in debug builds and void runs of the error handlers in non debug builds. --- Zend/zend_float.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Zend/zend_float.h b/Zend/zend_float.h index a17ad5658b9..56bdb151a06 100644 --- a/Zend/zend_float.h +++ b/Zend/zend_float.h @@ -65,11 +65,13 @@ extern ZEND_API void zend_ensure_fpu_mode(TSRMLS_D); MS Visual C: - Since MSVC users tipically don't use autoconf or CMake, we will detect - MSVC via compile time define. + MSVC via compile time define. Floating point precision change isn't + supported on 64 bit platforms, so it's NOP. See + http://msdn.microsoft.com/en-us/library/c9676k6h(v=vs.110).aspx */ /* MSVC detection (MSVC people usually don't use autoconf) */ -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(_WIN64) # if _MSC_VER >= 1500 /* Visual C++ 2008 or higher, supports _controlfp_s */ # define HAVE__CONTROLFP_S