From e5a996f26855fe89459ae7dcc31034e44e70b91d Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Mon, 13 Jul 2015 16:22:55 +0800 Subject: [PATCH] Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining) --- Zend/zend_operators.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 64c2620bf3..b38beb283b 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -1760,7 +1760,7 @@ static inline void zend_free_obj_get_result(zval *op) /* {{{ */ } /* }}} */ -static zend_always_inline int i_compare_function(zval *result, zval *op1, zval *op2) /* {{{ */ +ZEND_API int ZEND_FASTCALL compare_function(zval *result, zval *op1, zval *op2) /* {{{ */ { int ret; int converted = 0; @@ -1942,15 +1942,9 @@ static zend_always_inline int i_compare_function(zval *result, zval *op1, zval * } /* }}} */ -ZEND_API int ZEND_FASTCALL compare_function(zval *result, zval *op1, zval *op2) /* {{{ */ -{ - return i_compare_function(result, op1, op2); -} -/* }}} */ - ZEND_API int zval_compare_function(zval *result, zval *op1, zval *op2) /* {{{ */ { - return i_compare_function(result, op1, op2); + return compare_function(result, op1, op2); } /* }}} */ -- 2.50.1