summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2014-11-04 10:07:44 +0100
committerAnatol Belski <ab@php.net>2014-11-04 10:07:44 +0100
commit3b6cd5fe4ce81d3d219887339f3915140214708c (patch)
treed6198451c3d10ecede5929764fa8a559bf3e83b7
parentfaa4c6155ef384b7ffdd6de3b146fef79f8ba35c (diff)
downloadphp-git-3b6cd5fe4ce81d3d219887339f3915140214708c.tar.gz
improved the ZEND_FASTCALL convention for vc12+
-rw-r--r--Zend/zend_portability.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_portability.h b/Zend/zend_portability.h
index 1705965c6b..c159fdc77b 100644
--- a/Zend/zend_portability.h
+++ b/Zend/zend_portability.h
@@ -196,8 +196,10 @@ char *alloca();
#if defined(__GNUC__) && ZEND_GCC_VERSION >= 3004 && defined(__i386__)
# define ZEND_FASTCALL __attribute__((fastcall))
-#elif defined(_MSC_VER) && defined(_M_IX86)
+#elif defined(_MSC_VER) && defined(_M_IX86) && _MSC_VER <= 1700
# define ZEND_FASTCALL __fastcall
+#elif defined(_MSC_VER) && _MSC_VER >= 1800
+# define ZEND_FASTCALL __vectorcall
#else
# define ZEND_FASTCALL
#endif