diff options
| author | Xinchen Hui <laruence@php.net> | 2015-07-13 16:22:55 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-07-13 16:22:55 +0800 |
| commit | e5a996f26855fe89459ae7dcc31034e44e70b91d (patch) | |
| tree | 24b8b7be1076bd1c810289970cc8a46e9d0f9dae /Zend/zend_operators.c | |
| parent | eef41c57a356b7de3e773886a1acd8c9faa75a2d (diff) | |
| download | php-git-e5a996f26855fe89459ae7dcc31034e44e70b91d.tar.gz | |
Fixed bug #70057 (Build failure on 32-bit Mac OS X 10.6.8: recursive inlining)
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 10 |
1 files 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); } /* }}} */ |